Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Mar 5, 2025

Backport of #51258

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.

@ChristophWurst
Copy link
Member

/compile amend /

@nextcloud-command nextcloud-command force-pushed the backport/51258/stable30 branch from 61ba819 to 9c35a02 Compare March 5, 2025 12:43
@ChristophWurst ChristophWurst marked this pull request as ready for review March 5, 2025 12:50
@nickvergessen
Copy link
Member

This branch has conflicts that must be resolved

Use the web editor or the command line to resolve conflicts before continuing.

apps/dav/lib/Controller/OutOfOfficeController.php

@ChristophWurst ChristophWurst force-pushed the backport/51258/stable30 branch from 9c35a02 to 1d52257 Compare March 5, 2025 15:18
@ChristophWurst
Copy link
Member

/compile amend /

No need to send this from the client.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@AndyScherzinger AndyScherzinger force-pushed the backport/51258/stable30 branch from 14dd067 to 776d914 Compare March 5, 2025 21:51
@blizzz blizzz mentioned this pull request Mar 5, 2025
13 tasks
@ChristophWurst ChristophWurst merged commit dfac339 into stable30 Mar 6, 2025
176 checks passed
@ChristophWurst ChristophWurst deleted the backport/51258/stable30 branch March 6, 2025 05:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants