ORIENT/modules/backend/classes
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
2014-10-11 11:58:20 +02:00
..
AuthManager.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
BackendController.php Updating backend/classes 2014-10-10 23:12:50 +02:00
BackendHelper.php Updating backend/classes 2014-10-10 23:12:50 +02:00
Controller.php Updating backend/classes 2014-10-10 23:12:50 +02:00
ControllerBehavior.php Updating backend/classes 2014-10-10 23:12:50 +02:00
FilterScope.php Updating backend/classes 2014-10-10 23:12:50 +02:00
FormField.php Updating backend/classes 2014-10-10 23:12:50 +02:00
FormWidgetBase.php Updating backend/classes 2014-10-10 23:12:50 +02:00
ListColumn.php Updating backend/classes 2014-10-10 23:12:50 +02:00
NavigationManager.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
ReportWidgetBase.php Updating backend/classes 2014-10-10 23:12:50 +02:00
Skin.php Updating backend/classes 2014-10-10 23:12:50 +02:00
WidgetBase.php Updating backend/classes 2014-10-10 23:12:50 +02:00
WidgetManager.php Updating backend/classes 2014-10-10 23:12:50 +02:00