Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts: QuickLaunch/settings.properties
2019-04-28 11:31:44 +02:00
parent 1c61ff5219 02e63e14c0
commit 510cb9c295
30 changed files with 171 additions and 48 deletions
--- a/QuickLaunch/settings.properties
+++ b/QuickLaunch/settings.properties
@@ -2,4 +2,4 @@
 Load-File-on-startup=true
 key2=44
 key1=29
-Check-for-updates-on-startup=true
+Check-for-updates-on-startup=true