ORIENT/modules/backend/traits
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
..
CollapsableWidget.php Updating modules/backend/traits 2014-10-11 00:07:30 +02:00
InspectableContainer.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
SearchableWidget.php Updating modules/backend/traits 2014-10-11 00:07:30 +02:00
SelectableWidget.php Updating modules/backend/traits 2014-10-11 00:07:30 +02:00
WidgetMaker.php Updating modules/backend/traits 2014-10-11 00:07:30 +02:00