@theoholl Could you resolve merge conflicts?

@theoholl Could you resolve merge conflicts?

@luka-nextcloud Done.

@theoholl Thanks, it would be awesome if you could squash your commits into one.

To clarify a bit more, it would need a rebase of this change so that there is no extra merge commits in the commit history. Let us know if you have any questions around that.

@luka-nextcloud makes sense :) Should be OK now?

It looks good, thanks!

/backport to stable31

/backport to stable32

The backport to stable32 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable32
git pull origin stable32

# Create the new backport branch
git checkout -b backport/7446/stable32

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19c829c6

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7446/stable32

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/7446/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 19c829c6

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7446/stable31

Error: Failed to cherry pick commits: error: no cherry-pick or revert in progress
fatal: cherry-pick failed

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)