Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Jun 5, 2025

Backport of #53323

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.

@backportbot backportbot bot added 3. to review Waiting for reviews feature: caldav Related to CalDAV internals labels Jun 5, 2025
@backportbot backportbot bot added this to the Nextcloud 31.0.6 milestone Jun 5, 2025
@st3iny st3iny force-pushed the backport/53323/stable31 branch from 8051720 to fadfd28 Compare June 6, 2025 10:34
@st3iny st3iny marked this pull request as ready for review June 6, 2025 10:34
@st3iny st3iny requested a review from tcitworld as a code owner June 6, 2025 10:34
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

Conflict was a change in an empty line (white-space only).

@AndyScherzinger AndyScherzinger force-pushed the backport/53323/stable31 branch 2 times, most recently from d408898 to 1044e9d Compare June 12, 2025 20:01
…UserCount

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@AndyScherzinger AndyScherzinger force-pushed the backport/53323/stable31 branch from 1044e9d to 3f63140 Compare June 12, 2025 20:38
@AndyScherzinger AndyScherzinger merged commit e9ac2a6 into stable31 Jun 12, 2025
189 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/53323/stable31 branch June 12, 2025 21:35
@nextcloud-bot nextcloud-bot mentioned this pull request Jul 3, 2025
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews feature: caldav Related to CalDAV internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants