TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ORIENT/modules
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
..
backend Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
cms Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
system Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00