Merge branch 'settings' into dev

This commit is contained in:
Michal Kváček
2016-03-14 00:53:48 +01:00
22 changed files with 484 additions and 31 deletions
+1 -1
View File
@@ -123,7 +123,7 @@ abstract class Handler implements AppHandler
$sub->route('customfields.overview', trans('admin/mainMenu.customFieldsOverview'), [], 50, ['icon' => 'fa fa-code-fork']);
}, 30, ['icon' => 'fa fa-code']);
$menu->route('log.overview', trans('admin/mainMenu.actionLog'), [], 40, ['icon' => 'fa fa-history']);
$menu->url('#', trans('admin/mainMenu.settings'), 50, ['icon' => 'fa fa-gear']);
$menu->route('settings.overview', trans('admin/mainMenu.settings'), [], 50, ['icon' => 'fa fa-gear']);
});
// order