Merge remote branch 'origin/debug' into debug Conflicts: config/autoload/global.php # # It looks like you may be committing a MERGE. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch debug # Your branch and 'origin/debug' have diverged, # and have 1 and 2 different commit(s) each, respectively. # # Changes to be committed: # # modified: composer.json # modified: config/autoload/global.php # deleted: data/cache/.gitkeep # deleted: data/logs/.gitkeep # modified: module/Admin/config/module.config.php # new file: module/Admin/src/Admin/Controller/FileGroupTypeDictionaryController.php # new file: module/Admin/view/admin/file-group-type-dictionary/form.phtml # new file: module/Admin/view/admin/file-group-type-dictionary/index.phtml # new file: module/Admin/view/admin/file-group-type-dictionary/list.phtml # modified: module/Content/config/module.config.php # modified: module/Content/src/Content/Controller/FileController.php # modified: module/Content/src/Content/Controller/NewsController.php # new file: module/Content/src/Content/Controller/OnlineEventController.php # modified: module/Content/src/Content/Controller/QuizController.php # modified: module/Content/view/content/file/add-edit.phtml # modified: module/Content/view/content/file/details.phtml # modified: module/Content/view/content/file/index.phtml # modified: module/Content/view/content/file/list.phtml # new file: module/Content/view/content/online-event/add-edit.phtml # new file: module/Content/view/content/online-event/contentreview.phtml # new file: module/Content/view/content/online-event/index.phtml # new file: module/Content/view/content/online-event/list.phtml # modified: public/index.php #