Sebastian Stenzel 84d6f11be2 Merge branch 'develop' into feature/fuse-integration ...

# Conflicts:
#	main/commons/pom.xml
#	main/pom.xml

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

..

ant-kit

Preparing 1.3.2

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

commons

Merge branch 'develop' into feature/fuse-integration

2018-03-06 11:34:41 +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 branch 'develop' into feature/fuse-integration

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

pom.xml

Merge branch 'develop' into feature/fuse-integration

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