Merge branch 'master' into develop

# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
This commit is contained in:
Sebastian Stenzel
2019-08-02 16:36:41 +02:00
+1 -1
View File
@@ -28,7 +28,7 @@
<cryptomator.cryptofs.version>1.8.6</cryptomator.cryptofs.version>
<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
<cryptomator.fuse.version>1.2.0</cryptomator.fuse.version>
<cryptomator.dokany.version>1.1.9</cryptomator.dokany.version>
<cryptomator.dokany.version>1.1.10</cryptomator.dokany.version>
<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>
<javafx.version>12</javafx.version>