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 code clean	2014-10-18 15:52:44 +11:00
behaviors	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-18 11:07:17 +02: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-16 18:44:18 +02:00
database	Updating backend/database	2014-10-10 23:34:34 +02:00
facades	Updating backend/facades	2014-10-10 23:36:04 +02:00
formwidgets	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-18 11:07:17 +02:00
lang	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-16 18:44:18 +02:00
layouts	Cache BrandSettings compiled CSS	2014-10-16 19:49:29 +11:00
models	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-18 11:07:17 +02:00
skins	Updating modules/backend/skins	2014-10-11 00:05:35 +02:00
traits	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-11 11:58:20 +02:00
views	Important! All references to *Email* have been changed to *Mail*	2014-07-04 19:14:15 +10:00
widgets	Fixing minor issue	2014-10-11 12:15:02 +02:00
ServiceProvider.php	Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2	2014-10-18 11:07:17 +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 backend	2014-10-10 23:16:22 +02:00