Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 15, 2023

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

backport of #37227

@blizzz
Copy link
Member

blizzz commented Mar 16, 2023

@miaulalala @kesselb conflicts

@blizzz blizzz mentioned this pull request Mar 16, 2023
@blizzz blizzz added the 2. developing Work in progress label Mar 16, 2023
@miaulalala miaulalala force-pushed the backport/37227/stable25 branch 2 times, most recently from 50e07a5 to b3b9d81 Compare March 16, 2023 12:18
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@miaulalala miaulalala force-pushed the backport/37227/stable25 branch from b3b9d81 to cc1b616 Compare March 16, 2023 12:18
@miaulalala miaulalala marked this pull request as ready for review March 16, 2023 12:18
@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Mar 16, 2023
@blizzz blizzz merged commit 913bfc5 into stable25 Mar 16, 2023
@blizzz blizzz deleted the backport/37227/stable25 branch March 16, 2023 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants