From 5a81fba9293c0c7f098695d77aa332d0864c5ca8 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <50302941+JammingBen@users.noreply.github.com>
Date: Wed, 26 Jul 2023 12:11:47 +0000
Subject: [PATCH] Automated changelog update [skip ci]

---
 CHANGELOG.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f313c925..8492d37d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,7 +89,7 @@ The following sections list the changes for 3.1.0.
 * Enhancement - Add functionality to retry postprocessing: [#6500](https://github.com/owncloud/ocis/pull/6500)
 * Enhancement - Update go-micro kubernetes registry: [#6457](https://github.com/owncloud/ocis/pull/6457)
 * Enhancement - Update web to v7.0.1: [#6470](https://github.com/owncloud/ocis/pull/6470)
-* Enhancement - Update web to v7.1.0-rc.1: [#6828](https://github.com/owncloud/ocis/pull/6828)
+* Enhancement - Update web to v7.1.0-rc.2: [#6894](https://github.com/owncloud/ocis/pull/6894)
 * Enhancement - Allow disabling wopi chat: [#6544](https://github.com/owncloud/ocis/pull/6544)
 
 ## Details
@@ -460,11 +460,11 @@ The following sections list the changes for 3.1.0.
    https://github.com/owncloud/ocis/pull/6470
    https://github.com/owncloud/web/releases/tag/v7.0.1
 
-* Enhancement - Update web to v7.1.0-rc.1: [#6828](https://github.com/owncloud/ocis/pull/6828)
+* Enhancement - Update web to v7.1.0-rc.2: [#6894](https://github.com/owncloud/ocis/pull/6894)
 
    Tags: web
 
-   We updated ownCloud Web to v7.1.0-rc.1. Please refer to the changelog (linked) for details on
+   We updated ownCloud Web to v7.1.0-rc.2. Please refer to the changelog (linked) for details on
    the web release.
 
    ## Summary * Bugfix [owncloud/web#9078](https://github.com/owncloud/web/pull/9078):
@@ -484,9 +484,10 @@ The following sections list the changes for 3.1.0.
    [owncloud/web#9351](https://github.com/owncloud/web/pull/9351): Media controls
    overflow on mobile screens * Bugfix
    [owncloud/web#9389](https://github.com/owncloud/web/pull/9389): Space editors see
-   empty trashbin and delete actions in space trashbin * Enhancement
-   [owncloud/web#7967](https://github.com/owncloud/web/pull/7967): Add hasPriority
-   property for editors per extension * Enhancement
+   empty trashbin and delete actions in space trashbin * Bugfix
+   [owncloud/web#9461](https://github.com/owncloud/web/pull/9461): Merging folders *
+   Enhancement [owncloud/web#7967](https://github.com/owncloud/web/pull/7967): Add
+   hasPriority property for editors per extension * Enhancement
    [owncloud/web#8422](https://github.com/owncloud/web/issues/8422): Improve
    extension app topbar * Enhancement
    [owncloud/web#8445](https://github.com/owncloud/web/issues/8445): Open
@@ -553,8 +554,8 @@ The following sections list the changes for 3.1.0.
    for auth token * Enhancement
    [owncloud/web#9394](https://github.com/owncloud/web/pull/9394): Button styling
 
-   https://github.com/owncloud/ocis/pull/6828
-   https://github.com/owncloud/web/releases/tag/v7.1.0-rc.1
+   https://github.com/owncloud/ocis/pull/6894
+   https://github.com/owncloud/web/releases/tag/v7.1.0-rc.2
 
 * Enhancement - Allow disabling wopi chat: [#6544](https://github.com/owncloud/ocis/pull/6544)