Skip to content

[stable32] fix(groupware): Move admin and user documentation for mail app out of mail repo and update debug logging - #14002

Merged
kesselb merged 1 commit into
stable32from
backport/13993/stable32
Jan 21, 2026
Merged

[stable32] fix(groupware): Move admin and user documentation for mail app out of mail repo and update debug logging#14002
kesselb merged 1 commit into
stable32from
backport/13993/stable32

Conversation

@backportbot

@backportbot backportbot Bot commented Jan 20, 2026

Copy link
Copy Markdown

Backport of #13993

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

Todo

  • Review and resolve any conflicts
  • 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.

… mail repo and update debug logging

Signed-off-by: David Dreschner <github-2017@dreschner.net>
@DerDreschner
DerDreschner force-pushed the backport/13993/stable32 branch from 07e6acc to 96fd7a7 Compare January 21, 2026 09:37
@DerDreschner
DerDreschner marked this pull request as ready for review January 21, 2026 09:38
@kesselb

kesselb commented Jan 21, 2026

Copy link
Copy Markdown
Contributor

@DerDreschner mind to cherry-pick #14001 right away?

@DerDreschner

Copy link
Copy Markdown
Contributor

I've manually copied everything from #14001 in here when resolving the merge conflict. As everything should be squashed (I think?), I thought it's okay to do that.

@kesselb

kesselb commented Jan 21, 2026

Copy link
Copy Markdown
Contributor

Yep, I was only confused by the missing contacts section in the troubleshooting guide.

@kesselb
kesselb merged commit 02268f7 into stable32 Jan 21, 2026
12 checks passed
@kesselb
kesselb deleted the backport/13993/stable32 branch January 21, 2026 17:41
@DerDreschner

DerDreschner commented Jan 21, 2026

Copy link
Copy Markdown
Contributor

I was confused, too. But I were unsure if I should backport that or not (as the commit/PR is a couple weeks old). Should maybe have asked in the team chat, sorry 😓

@kesselb

kesselb commented Jan 22, 2026

Copy link
Copy Markdown
Contributor

All good, no need to apologize. Resolving the conflicts, which were mostly caused by the other PR not being backported, and focusing only on backporting that change was the right move.

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