Sebastian Stenzel 06e526a961 Merge branch 'develop' into feature/external-keychain ...

# Conflicts:
#	main/pom.xml

2016-08-31 19:45:15 +02:00

..

main/java/org/cryptomator/common

externalized JNI bindings

2016-08-30 17:19:45 +02:00

test/java/org/cryptomator/common

Feature/travis container builds (#334)

2016-08-31 19:39:55 +02:00