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

Merge branch 'patches-1.0.x'

Browse Source 
# Conflicts:
#	main/filesystem-charsets/pom.xml
This commit is contained in:
Sebastian Stenzel
2016-05-10 14:49:20 +02:00
parent dcea9e21f0 b77d4b5ae2
commit 0477a0a2e3
13 changed files with 143 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/commons/pom.xml
-5
View File
@@ -44,11 +44,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.bechte.junit</groupId>
<artifactId>junit-hierarchicalcontextrunner</artifactId>