Commit Graph

6 Commits

Author SHA1 Message Date
Samuel Georges beb818efa5 Merge branch 'develop' into laravel5
Conflicts:
	modules/cms/classes/CmsCompoundObject.php
	modules/system/ServiceProvider.php
2015-02-04 19:35:55 +11:00
Samuel Georges 8ab39cb424 Minor 2015-02-01 23:56:27 +11:00
Samuel Georges b1b700368f Radical reorg of some classes 2015-01-28 11:49:54 +11:00
Stefan Talen 202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02:00
Sam Georges 56d0c3351b private -> protected 2014-08-01 14:54:16 +10:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00