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

Merge branch 'develop' into feature/fuse-integration

Browse Source 
# Conflicts:
#	main/commons/pom.xml
#	main/pom.xml
This commit is contained in:
Sebastian Stenzel
2018-03-06 11:34:41 +01:00
parent b3cf7eee16 9e5e14e462
commit 84d6f11be2
18 changed files with 143 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/pom.xml
-8
View File
@@ -66,20 +66,12 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<!-- DI -->
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger</artifactId>
</dependency>
<dependency>
<groupId>com.google.dagger</groupId>
<artifactId>dagger-compiler</artifactId>
</dependency>
<!-- Zxcvbn -->
<dependency>