Переглянути джерело

Merge branch 'main' into develop

# Conflicts:
#	pom.xml
Armin Schrenk 1 тиждень тому
батько
коміт
eb3c1f3c7a

+ 3 - 0
dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml

@@ -74,6 +74,9 @@
 	</content_rating>
 
 	<releases>
+		<release date="2024-11-19" version="1.14.2">
+			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.2</url>
+		</release>
 		<release date="2024-09-17" version="1.14.0">
 			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.0</url>
 		</release>

+ 2 - 2
pom.xml

@@ -33,11 +33,11 @@
 		<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents</nonModularGroupIds>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.7.0</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.7.1</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.4.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.3.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.2.4</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.5.0</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.linux.version>1.5.1</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>5.0.2</cryptomator.fuse.version>
 		<cryptomator.webdav.version>2.0.7</cryptomator.webdav.version>