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 |
Sam Georges
|
ed552f1591
|
Minor code clean
|
2014-10-18 15:52:44 +11:00 |
|
Stefan Talen
|
634865e42e
|
Updating modules/cms/widgets
|
2014-10-11 01:53:40 +02:00 |
alekseybobkov
|
26e8d5bda5
|
Minor updates in the back-end UI
|
2014-10-05 22:21:03 -07:00 |
|
Sam Georges
|
71a5dd67ab
|
Welcome to the world, October :-)
|
2014-05-14 23:24:20 +10:00 |