Merge branch 'develop' into feature/jdk21

# Conflicts:
#	pom.xml
This commit is contained in:
Sebastian Stenzel
2023-09-25 12:15:14 +02:00
15 changed files with 82 additions and 47 deletions
+2 -2
View File
@@ -35,8 +35,8 @@
<!-- cryptomator dependencies -->
<cryptomator.cryptofs.version>2.6.7</cryptomator.cryptofs.version>
<cryptomator.integrations.version>1.3.0</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.2.2</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.2.1</cryptomator.integrations.mac.version>
<cryptomator.integrations.win.version>1.2.3</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.2.2</cryptomator.integrations.mac.version>
<cryptomator.integrations.linux.version>1.4.0-beta1</cryptomator.integrations.linux.version>
<cryptomator.fuse.version>4.0.0-beta1</cryptomator.fuse.version>
<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>