Skip to content

Conversation

@backportbot-nextcloud
Copy link

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

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

backport of #38063

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.2 milestone May 5, 2023
@skjnldsv skjnldsv added the 4. to release Ready to be released and/or waiting for tests to finish label May 5, 2023
@skjnldsv
Copy link
Member

skjnldsv commented May 5, 2023

/compile amend /

@skjnldsv skjnldsv marked this pull request as ready for review May 5, 2023 12:21
@nextcloud-command nextcloud-command force-pushed the backport/38063/stable26 branch from 68d93cf to 3091741 Compare May 5, 2023 13:50
@juliusknorr juliusknorr force-pushed the backport/38063/stable26 branch from 3091741 to 8914b50 Compare May 9, 2023 10:36
@juliusknorr
Copy link
Member

Recompiled scss to resolve the conflict

@juliusknorr juliusknorr merged commit b7602ca into stable26 May 10, 2023
@juliusknorr juliusknorr deleted the backport/38063/stable26 branch May 10, 2023 06:34
@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 bug feature: theming regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants