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
..
assetlist	Remove blueimp uploader, replaced with dropzone.js	2014-10-20 18:55:31 +11:00
componentlist/partials	Escape all the translated strings	2014-08-13 08:01:18 +10:00
templatelist/partials	Minor code clean	2014-10-18 15:52:44 +11:00
AssetList.php	Radical reorg of some classes	2015-01-28 11:49:54 +11:00
ComponentList.php	Radical reorg of some classes	2015-01-28 11:49:54 +11:00
TemplateList.php	Change sort by fileName on cms template directory list.	2015-01-27 17:25:29 +09:00