Merge branch 'master' into develop

This commit is contained in:
Sebastian Stenzel
2020-04-16 13:05:34 +02:00
18 changed files with 117 additions and 95 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>