mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 04:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5b13553866e58a6a903596c56a31c97a3f530dcc
cryptomator/src/test
History
Sebastian Stenzel 2b255ed101 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
2022-04-13 07:21:59 +02:00
..
java/org/cryptomator
Merge branch 'develop' into feature/integrations-api-1.1.0
2022-04-13 07:21:59 +02:00
resources/mockito-extensions
Single maven module (#1676)
2021-06-04 20:09:10 +02:00