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
..
2014-10-11 01:22:03 +02:00
2015-01-28 11:49:54 +11:00
2015-01-28 11:49:54 +11:00
2014-10-11 01:22:03 +02:00
2015-01-28 11:49:54 +11:00
2015-01-28 11:49:54 +11:00
2014-10-11 01:22:03 +02:00
2014-10-11 01:22:03 +02:00
2015-01-28 11:49:54 +11:00
2014-10-11 01:22:03 +02:00
2015-01-28 11:49:54 +11:00
2015-01-28 11:49:54 +11:00
2014-10-11 01:22:03 +02:00