mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-05-17 10:11:27 +00:00
# Conflicts: # pom.xml # src/main/java/org/cryptomator/common/vaults/Vault.java # src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java