Skip to content

Conversation

@backportbot-nextcloud
Copy link

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

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

backport of #38242

@szaimen szaimen marked this pull request as ready for review May 15, 2023 10:49
@szaimen szaimen added the 3. to review Waiting for reviews label May 15, 2023
@szaimen
Copy link
Contributor

szaimen commented May 15, 2023

/compile amend /

@szaimen szaimen enabled auto-merge May 15, 2023 10:50
Signed-off-by: Simon L <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the backport/38242/stable25 branch from 04e882c to 38d1d57 Compare May 15, 2023 16:21
@szaimen szaimen disabled auto-merge May 16, 2023 06:31
@szaimen szaimen merged commit 2812b98 into stable25 May 16, 2023
@szaimen szaimen deleted the backport/38242/stable25 branch May 16, 2023 06:31
@blizzz blizzz mentioned this pull request May 16, 2023
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.

3 participants