6 Commits

Author SHA1 Message Date
gergo85
f0005d196b Cleanup
Remove whitespaces.
2015-01-03 12:41:23 +01:00
Stefan Talen
06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
2014-10-16 18:44:18 +02:00
Sam Georges
57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Stefan Talen
40640d1923 Updating single files in modules/cms 2014-10-11 01:56:53 +02:00
Sam Georges
04bbad320f Fixes #347, Fixes #401 - Allow user routes to be registered before the CMS 2014-07-12 13:16:16 +10:00
Sam Georges
71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00