TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ORIENT/modules/cms
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
..
assets Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
classes Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
controllers Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
database/migrations TraceLog -> EventLog 2014-07-30 17:19:51 +10:00
formwidgets Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
lang Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00
twig Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
views Fixes broken icon refs 2014-05-17 00:08:59 +10:00
widgets Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00
ServiceProvider.php Updating single files in modules/cms 2014-10-11 01:56:53 +02:00
composer.json Convert autoload refs to PSR-4 so they actually work 2014-09-19 17:23:11 +10:00
routes.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-16 18:44:18 +02:00