mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-24 08:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/vaultVersion5' into develop

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-08-30 19:14:28 +02:00
parent a9c2b0fc57 e90880ac9a
commit f39b7b047f
39 changed files with 306 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/pom.xml
+8
View File
@@ -27,6 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.0.0-SNAPSHOT</cryptomator.cryptolib.version>
<log4j.version>2.1</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
<junit.version>4.12</junit.version>
@@ -122,6 +123,13 @@
<artifactId>ui</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Libs -->
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>cryptolib</artifactId>
<version>${cryptomator.cryptolib.version}</version>
</dependency>
<!-- Logging -->
<dependency>