
# Conflicts: # app/Console/Kernel.php # app/FaveoStorage/Controllers/SettingsController.php # app/Http/Controllers/Admin/helpdesk/TemplateController.php
# Conflicts: # app/Console/Kernel.php # app/FaveoStorage/Controllers/SettingsController.php # app/Http/Controllers/Admin/helpdesk/TemplateController.php