ORIENT/modules/cms/widgets
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
..
assetlist Fixes broken icon ref 2014-09-20 17:25:21 +10:00
componentlist/partials Escape all the translated strings 2014-08-13 08:01:18 +10:00
templatelist/partials Minor code clean 2014-10-18 15:52:44 +11:00
AssetList.php Updating modules/cms/widgets 2014-10-11 01:53:40 +02:00
ComponentList.php Updating modules/cms/widgets 2014-10-11 01:53:40 +02:00
TemplateList.php Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-18 11:07:17 +02:00