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
@miaulalala miaulalala force-pushed the backport/37227/stable24 branch from 55b7961 to ac1f92b Compare March 16, 2023 13:23
@miaulalala miaulalala force-pushed the backport/37227/stable24 branch from ac1f92b to a561c32 Compare March 16, 2023 13:31
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@blizzz blizzz added the 3. to review Waiting for reviews label Mar 16, 2023
@miaulalala miaulalala marked this pull request as ready for review March 16, 2023 13:50
@blizzz blizzz merged commit 24b536f into stable24 Mar 16, 2023
@blizzz blizzz deleted the backport/37227/stable24 branch March 16, 2023 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants