mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-21 18:16:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
e93e31e745d90070d7371a1763b36b2df7b12cae
cryptomator/src/main/java
History
Sebastian Stenzel e93e31e745 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-03 12:53:08 +02:00
..
org/cryptomator
Merge branch 'develop' into feature/integrations-api-1.1.0
2022-04-03 12:53:08 +02:00
module-info.java
Merge branch 'develop' into feature/integrations-api-1.1.0
2022-04-03 12:53:08 +02:00