Merge branch 'develop' into patch-1

This commit is contained in:
Sebastian Stenzel
2016-11-06 21:53:28 +01:00
committed by GitHub
19 changed files with 19 additions and 19 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.2.0</version>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>