Merge tag '1.3.5' into develop

1.3.5

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
This commit is contained in:
Sebastian Stenzel
2018-04-03 10:41:43 +02:00
+1 -1
View File
@@ -25,7 +25,7 @@
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.2.0</cryptomator.cryptolib.version>
<cryptomator.cryptofs.version>1.5.0</cryptomator.cryptofs.version>
<cryptomator.cryptofs.version>1.5.1</cryptomator.cryptofs.version>
<cryptomator.webdav.version>1.0.4</cryptomator.webdav.version>
<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
<cryptomator.fuse.version>0.1.2</cryptomator.fuse.version>