Sebastian Stenzel f3bfe7b64c Merge branch 'develop' into feature/hub ...

# 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

2022-04-08 20:27:02 +02:00

..

codeStyles

Updated codestyle (#1388)

2020-11-02 08:45:41 +01:00

dictionaries

Enabled proofreading

2021-06-12 01:35:36 +02:00

inspectionProfiles

Enabled proofreading

2021-06-12 01:35:36 +02:00

runConfigurations

Merge branch 'develop' into feature/hub

2022-04-08 20:27:02 +02:00

.name

added intellij project configuration

2019-01-15 13:15:38 +01:00

encodings.xml

bumped dependencies

2022-03-23 10:42:20 +01:00

icon.svg

implemented new algorithm

2021-10-13 12:12:56 +02:00

misc.xml

Update to JDK 17 (#1828)

2021-10-08 14:59:24 +02:00

vcs.xml

added intellij project configuration

2019-01-15 13:15:38 +01:00