Sebastian Stenzel db0aceefdf Merge branch 'develop' into feature/375-readonly ...

# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
#	main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
#	main/ui/src/main/resources/fxml/unlock.fxml

2019-02-08 15:28:40 +01:00

..

src

Merge branch 'develop' into feature/375-readonly

2019-02-08 15:28:40 +01:00

pom.xml

bumped version

2018-11-05 10:46:39 +01:00