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
..
maintenancesetting	Clarify maintenance mode behavior	2016-06-24 06:48:16 +10:00
themeexport	Update various language references	2015-03-16 19:33:58 +11:00
themeimport	Update various language references	2015-03-16 19:33:58 +11:00
themelog	Typo	2017-02-13 08:29:34 +11:00
MaintenanceSetting.php	string -> ::class + docs	2017-05-20 20:01:19 +10:00
ThemeData.php	Merge branch 'develop' into feature/cleanup	2018-08-24 19:52:54 +02:00
ThemeExport.php	Remove unused imports	2018-08-24 19:51:59 +02:00
ThemeImport.php	Remove unused imports	2018-08-24 19:51:59 +02:00
ThemeLog.php	Update ThemeLog when file name is changed (#3696)	2018-08-17 10:25:18 -06:00