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

Conflicts:
	QuickLaunch/settings.properties
This commit is contained in:
C0d3v committed 2019-04-28 11:31:44 +02:00
commit 510cb9c295
30 files changed
+171 -48

No files matched your search

+1 -1
View File
@@ -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