TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ORIENT/modules/backend/classes
History
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
 		2014-10-18 11:07:17 +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 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +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 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00