# Conflicts: # .drone.yml # .gitignore # Source/Config/Autoload.php # Source/Config/Clean.php # Source/Config/config.php # Source/Controller/ControllerAdmin.php # Source/Model/ModelAdmin.php