Merge branch 'develop' into feature/jdk21

# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
This commit is contained in:
Sebastian Stenzel
2023-09-18 19:33:06 +02:00
25 changed files with 188 additions and 60 deletions
+2 -2
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>cryptomator</artifactId>
<version>1.10.0-SNAPSHOT</version>
<version>1.11.0-SNAPSHOT</version>
<name>Cryptomator Desktop App</name>
<organization>
@@ -40,7 +40,7 @@
<cryptomator.integrations.linux.version>1.3.0-beta6</cryptomator.integrations.linux.version>
<cryptomator.fuse.version>4.0.0-beta1</cryptomator.fuse.version>
<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>
<cryptomator.webdav.version>2.0.3</cryptomator.webdav.version>
<cryptomator.webdav.version>2.0.4</cryptomator.webdav.version>
<!-- 3rd party dependencies -->
<commons-lang3.version>3.13.0</commons-lang3.version>