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

..

ant-kit

updated IDE settings and removed duplicate gitignore [ci skip]

2019-01-17 11:07:01 +01:00

commons

Merge branch 'develop' into feature/375-readonly

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

keychain

bumped version

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

launcher

bumped version

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

uber-jar

bumped version

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

ui

Merge branch 'develop' into feature/375-readonly

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

pom.xml

fixes #732

2019-01-16 16:10:11 +01:00