mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity
winter/modules/cms/controllers
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
..
index
BackendSettings -> BrandSettings
2014-10-15 19:53:44 +11:00
themes
Minor code clean
2014-10-18 14:32:06 +11:00
Index.php
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
2014-10-18 11:07:17 +02:00
Themes.php
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
2014-10-16 18:44:18 +02:00