Samuel Georges f0df1f458b Merge branch 'develop' into l55upgrade ... Conflicts: modules/system/assets/ui/storm.css		2017-05-27 22:24:57 +10:00
..
assetlist	Additional security fixes	2017-04-10 16:02:05 +10:00
componentlist/partials	Clean up	2016-03-28 15:47:29 +02:00
mediamanager	Backend UI improvements	2017-05-20 20:00:24 +10:00
templatelist/partials	Partials, pages and content now support drag'n'drop	2017-04-28 23:37:50 +10:00
AssetList.php	Fixed spaces	2017-05-19 11:29:19 +02:00
ComponentList.php	Removes redundant code	2016-11-01 08:15:03 +11:00
MediaManager.php	thumbnailDirectory -> thumbFolder	2017-05-16 08:47:15 +10:00
TemplateList.php	Partials, pages and content now support drag'n'drop	2017-04-28 23:37:50 +10:00