Skip to content

[stable5.10] fix: sorting of items in "Mail settings" dialog#13198

Draft
backportbot[bot] wants to merge 1 commit into
stable5.10from
backport/13171/stable5.10
Draft

[stable5.10] fix: sorting of items in "Mail settings" dialog#13198
backportbot[bot] wants to merge 1 commit into
stable5.10from
backport/13171/stable5.10

Conversation

@backportbot

@backportbot backportbot Bot commented Jul 2, 2026

Copy link
Copy Markdown

Backport of #13171

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

fix: sorting of items in "Mail settings" dialog

Signed-off-by: Roberto Guido <info@madbob.org>

[skip ci]
@GretaD

GretaD commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

@madbob would you be able to solve the conflicts on this pr? I think its the spaces that were added on the initial one :)

@madbob

madbob commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

As stated in this PR description, the changes included in this PR are not the same of the original PR, as the backportbot's version totally ignores the removed lines of code. I don't know why...

Merging this PR into stable5.10 produces no conflits, it is just wrong (old and new code overlaps).

I've tried to fix the commit and force-push again the branch backport/13171/stable5.10, but I have not the permissions...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants