Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 1, 2023

  • ⚠️ This backport had conflicts and is incomplete

backport of #3733

…theme but user uses bright one

Signed-off-by: Ferdinand Thiessen <[email protected]>
@backportbot-nextcloud backportbot-nextcloud bot added bug: regression design Experience, interaction, interface, … labels Feb 1, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.4 milestone Feb 1, 2023
@mejo-
Copy link
Member

mejo- commented Feb 1, 2023

/compile

Copy link
Contributor

@susnux susnux left a comment

Choose a reason for hiding this comment

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

I do not see any conflicts, looks good to me.

@cypress
Copy link

cypress bot commented Feb 1, 2023

Passing run #8414 ↗︎

0 99 0 0 Flakiness 0

Details:

Merge 3b4bbd7 into e8c00fb...
Project: Text Commit: b581656afe ℹ️
Status: Passed Duration: 05:38 💡
Started: Feb 1, 2023 3:56 PM Ended: Feb 1, 2023 4:01 PM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@juliusknorr
Copy link
Member

Yep, the conflict message also happens if you only backport individual commits.

Signed-off-by: nextcloud-command <[email protected]>
@susnux susnux merged commit bd7575d into stable25 Feb 1, 2023
@susnux susnux deleted the backport/3733/stable25 branch February 1, 2023 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

design Experience, interaction, interface, …

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants