Merge branch 'develop' into openjdk11

This commit is contained in:
Armin Schrenk
2019-01-09 16:07:47 +01:00
32 changed files with 292 additions and 166 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>