Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 31, 2023

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #38259

Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@icewind1991 icewind1991 force-pushed the backport/38259/stable25 branch from 4980fce to 03ca46e Compare June 9, 2023 15:02
@icewind1991
Copy link
Member

/compile

Signed-off-by: nextcloud-command <[email protected]>
@icewind1991 icewind1991 marked this pull request as ready for review June 9, 2023 15:45
@icewind1991 icewind1991 merged commit 11d3892 into stable25 Jun 9, 2023
@icewind1991 icewind1991 deleted the backport/38259/stable25 branch June 9, 2023 17:43
@blizzz blizzz mentioned this pull request Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants