ORIENT/modules/cms
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
2014-10-11 11:58:20 +02:00
..
assets Fixes validation on Tabs and Cms pages 2014-09-29 14:04:05 +10:00
classes Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
controllers Updating modules/cms/controllers 2014-10-11 01:27:52 +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-11 11:58:20 +02:00
twig Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 2014-10-11 11:58:20 +02:00
views Fixes broken icon refs 2014-05-17 00:08:59 +10:00
widgets Updating modules/cms/widgets 2014-10-11 01:53:40 +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 Updating single files in modules/cms 2014-10-11 01:56:53 +02:00