ORIENT/modules/backend/controllers
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
2014-10-16 18:44:18 +02:00
..
accesslogs Improvements to logging screens and internals of List widget 2014-08-06 11:19:59 +10:00
auth BackendSettings -> BrandSettings 2014-10-15 19:53:44 +11:00
editorpreferences BackendSettings -> BrandSettings 2014-10-15 19:53:44 +11:00
groups BackendSettings -> BrandSettings 2014-10-15 19:53:44 +11:00
index Roll back the moo 2014-07-30 18:13:22 +10:00
users BackendSettings -> BrandSettings 2014-10-15 19:53:44 +11:00
AccessLogs.php Updating backend/controllers 2014-10-10 23:26:57 +02:00
Auth.php Updating backend/controllers 2014-10-10 23:26:57 +02:00
EditorPreferences.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
Groups.php Updating backend/controllers 2014-10-10 23:26:57 +02:00
Index.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
Users.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00