Merge pull request #2074 from nextcloud/release/4.2.5v4.2.5

Prepare release of 4.2.5

4 files changed, 8 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ae84193..181c4c3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.2.5
+
+- Fix CSP violation when Nextcloud server has so-called 'service root' ([#2056](https://github.com/nextcloud/richdocuments/pull/2056))
+
 ## 4.2.4
 
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 24066db9..65dd2e8f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>4.2.4</version>
+	<version>4.2.5</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
diff --git a/package-lock.json b/package-lock.json
index 03392936..285781ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "richdocuments",
-	"version": "4.2.3",
+	"version": "4.2.5",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
diff --git a/package.json b/package.json
index 7bbb6632..960311a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "richdocuments",
 	"description": "Collabora online integration",
-	"version": "4.2.4",
+	"version": "4.2.5",
 	"authors": [
 		{
 			"name": "Julius Härtl",
@@ -114,4 +114,4 @@
 		],
 		"globalSetup": "<rootDir>/src/tests/setup.js"
 	}
-}
\ No newline at end of file
+}