Merge branch 'develop' into release/1.5.9

This commit is contained in:
Sebastian Stenzel
2020-11-16 17:16:54 +01:00
30 changed files with 401 additions and 51 deletions
@@ -7,6 +7,6 @@ java \
-Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \
-Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \
-Djdk.gtk.version=2 \
-Xss20m \
-Xss2m \
-Xmx512m \
org.cryptomator.launcher.Cryptomator
org.cryptomator.launcher.Cryptomator