Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 25, 2023

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

backport of #37780

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.2 milestone Apr 25, 2023
@Pytal Pytal force-pushed the backport/37780/stable26 branch from 9ce3116 to 3fbe8b1 Compare April 25, 2023 00:25
@Pytal Pytal self-assigned this Apr 25, 2023
@Pytal Pytal added the 3. to review Waiting for reviews label Apr 25, 2023
@Pytal Pytal marked this pull request as ready for review April 25, 2023 00:28
@Pytal Pytal requested a review from hamza221 April 25, 2023 00:29
Pytal added 2 commits April 25, 2023 09:54
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 87ae9bb)
Signed-off-by: Christopher Ng <[email protected]>
(cherry picked from commit 79310bd)
@artonge
Copy link
Contributor

artonge commented Apr 25, 2023

Rebased

@artonge artonge force-pushed the backport/37780/stable26 branch from 3fbe8b1 to c02a34f Compare April 25, 2023 07:59
@artonge artonge enabled auto-merge April 25, 2023 07:59
@artonge artonge merged commit 7fdc049 into stable26 Apr 25, 2023
@artonge artonge deleted the backport/37780/stable26 branch April 25, 2023 09:02
@Pytal Pytal added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 25, 2023
@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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants