Sebastian Stenzel 28cb2e1301 Merge branch 'develop' into feature/cryptofs ...

# Conflicts:
#	main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java
#	main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/WebDavServerTest.java

2017-02-24 16:51:42 +01:00

..

ant-kit

added linux-launcher-* to RPM [ci skip]

2016-12-12 11:39:23 +01:00

commons

now passing unchecked CryptoExceptions up through various closures, thus being able to catch “InvalidPassphraseException” in UI

2016-12-21 17:29:54 +01:00

commons-test

increased version to 1.3.0-SNAPSHOT

2016-09-15 13:35:22 +02:00

jacoco-report

call me THE DESTROYER!!!

2016-12-16 17:20:56 +01:00

keychain

Updated dependencies

2017-02-24 16:48:15 +01:00

uber-jar

increased version to 1.3.0-SNAPSHOT

2016-09-15 13:35:22 +02:00

ui

Merge branch 'develop' into feature/cryptofs

2017-02-24 16:51:42 +01:00

pom.xml

Updated dependencies

2017-02-24 16:48:15 +01:00