Merge branch 'master' into develop

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/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
2019-02-15 08:45:05 +01:00

View File

@@ -29,7 +29,7 @@
<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
<cryptomator.fuse.version>1.1.0</cryptomator.fuse.version>
<cryptomator.dokany.version>1.1.3</cryptomator.dokany.version>
<cryptomator.webdav.version>1.0.6</cryptomator.webdav.version>
<cryptomator.webdav.version>1.0.7</cryptomator.webdav.version>
<commons-io.version>2.6</commons-io.version>
<commons-lang3.version>3.8.1</commons-lang3.version>