mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-19 14:34:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/external-keychain

Browse Source 
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
This commit is contained in:
Sebastian Stenzel
2016-08-30 19:22:45 +02:00
parent 72e52df4e0 995bba616f
commit 902b29ee0a
46 changed files with 521 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/pom.xml
+6
View File
@@ -59,6 +59,12 @@
<artifactId>jni</artifactId>
</dependency>
<!-- CryptoLib -->
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>cryptolib</artifactId>
</dependency>
<!-- EasyBind -->
<dependency>
<groupId>org.fxmisc.easybind</groupId>