Nathan van der Werf 8fd16d4db6 Merge branch 'develop' into feature/cleanup ... # Conflicts: # modules/backend/formwidgets/FileUpload.php		2018-08-24 19:52:54 +02:00
..
assetlist	Selectable box and fancy breadcrumb	2017-06-05 17:35:15 +10:00
componentlist/partials	Rename methods in CollapsableWidget	2017-06-10 15:42:24 +10:00
templatelist/partials	Modify sorting icon from "desc" to "asc" (#3705)	2018-08-17 15:12:41 -06:00
AssetList.php	Remove unused imports	2018-08-24 19:51:59 +02:00
ComponentList.php	Refactor ternary operators to null coalescing operators	2018-08-15 19:15:13 +02:00
MediaManager.php	>= PHP7.0 refactoring (#3343)	2018-01-12 00:23:20 -06:00
TemplateList.php	Remove unused imports	2018-08-24 19:51:59 +02:00