Sebastian Stenzel 28001710b3 Merge commit '8ec2b10a4d546b148ec2d6f75b284a636b2b9edf' into develop ...

# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/model/Vault.java

fixes #627

2018-03-23 06:23:04 +01:00

..

ant-kit

Include logback.xml in antkit, so .deb, .rpm and ppa releases can use it. fixes #650

2018-03-13 11:52:48 +01:00

commons

Renamed nioAdapterImpl to volumeImpl.

2018-03-17 16:08:58 +01:00

jacoco-report

first attempt of building Cryptomator with jdk9

2017-12-20 18:42:16 +01:00

keychain

updated pom.xml files

2018-02-26 18:33:51 +01:00

launcher

updated pom.xml files

2018-02-26 18:33:51 +01:00

uber-jar

Preparing 1.3.2

2017-11-25 17:03:24 +01:00

ui

Merge commit '8ec2b10a4d546b148ec2d6f75b284a636b2b9edf' into develop

2018-03-23 06:23:04 +01:00

pom.xml

Merge branch 'develop' into feature/fuse-integration

2018-03-06 11:34:41 +01:00