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

Merge branch 'develop' into feature/javafx-launcher

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Sebastian Stenzel
2022-03-31 08:55:49 +02:00
parent e907360419 28db04e621
commit dc6b5774b8
14 changed files with 146 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/cryptomator/common/mountpoint/CustomMountPointChooserTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class CustomMountPointChooserTest {
this.volume = Mockito.mock(Volume.class);
this.vaultSettings = Mockito.mock(VaultSettings.class);
this.environment = Mockito.mock(Environment.class);
this.customMpc = new CustomMountPointChooser(vaultSettings, environment);
this.customMpc = new CustomMountPointChooser(vaultSettings);
}
@Nested