mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-05-21 12:11:28 +00:00
f3bfe7b64c
# Conflicts: # .github/workflows/release.yml # .idea/runConfigurations/Cryptomator_Linux.xml # .idea/runConfigurations/Cryptomator_Linux_Dev.xml # .idea/runConfigurations/Cryptomator_Windows.xml # .idea/runConfigurations/Cryptomator_Windows_Dev.xml # .idea/runConfigurations/Cryptomator_macOS.xml # .idea/runConfigurations/Cryptomator_macOS_Dev.xml # pom.xml # src/main/java/module-info.java # src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java # src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java # src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java # src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java # src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java # src/main/resources/license/THIRD-PARTY.txt