Merge pull request #2226 from nextcloud/release/6.1.0v6.1.0

Release/6.1.0

4 files changed, 13 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddb2586d..cb4fd5c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Changelog
 
-## 6.0.0
+## 6.1.0
+
+### Added
+- Added support for file locking @juliushaertl [#2104](https://github.com/nextcloud/richdocuments/pull/2104)
 
+### Fixed
+- Optimised audit triggering @juliushaertl [#1957](https://github.com/nextcloud/richdocuments/pull/1957)
+- Fixed viewer styling @juliushaertl [#2221](https://github.com/nextcloud/richdocuments/pull/2221) [#2212](https://github.com/nextcloud/richdocuments/pull/2212)
+- Disabled remote image insertion on public links @juliushaertl [#2175](https://github.com/nextcloud/richdocuments/pull/2175)
+- Fixed file revision behaviour on group folders @Raudius [#2172](https://github.com/nextcloud/richdocuments/pull/2197)
 
 
 ## 6.0.0
diff --git a/appinfo/info.xml b/appinfo/info.xml
index e8deaa4c..5d4b35a3 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>6.0.0</version>
+	<version>6.1.0</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 e9d9e72c..870e9c18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "richdocuments",
-	"version": "6.0.0",
+	"version": "6.1.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "richdocuments",
-			"version": "6.0.0",
+			"version": "6.1.0",
 			"license": "AGPL-3.0-or-later",
 			"dependencies": {
 				"@nextcloud/auth": "^1.3.0",
diff --git a/package.json b/package.json
index cc1b8909..754aeb91 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "richdocuments",
 	"description": "Collabora online integration",
-	"version": "6.0.0",
+	"version": "6.1.0",
 	"authors": [
 		{
 			"name": "Julius Härtl",