Skip to content

Conversation

@backportbot-nextcloud
Copy link

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

  • ⚠️ This backport had conflicts and is incomplete

backport of #36192

@blizzz
Copy link
Member

blizzz commented Feb 13, 2023

moving to 24.0.11. also, conflicts.

@blizzz blizzz added the 2. developing Work in progress label Feb 13, 2023
@MichaIng
Copy link
Member

/rebase

@MichaIng MichaIng force-pushed the backport/36192/stable24 branch from 77f6ed9 to 51f828d Compare February 27, 2023 15:15
@MichaIng MichaIng force-pushed the backport/36192/stable24 branch from 51f828d to ba6e13d Compare February 27, 2023 15:16
@MichaIng MichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 27, 2023
@MichaIng
Copy link
Member

MichaIng commented Feb 27, 2023

Conflict solved.

					'id' => $reminder['object_id'],
				], $reminder['event_hash'], $alarmHash, true, false);
-				], $reminder['event_hash'], $alarmHash, true, false);
+				], $calendarTimeZone, $reminder['event_hash'], $alarmHash, true, false);
				$this->writeRemindersToDatabase($alarms);

Was not done automatically due to changed indentation.

@MichaIng MichaIng merged commit 6b01e5d into stable24 Feb 27, 2023
@MichaIng MichaIng deleted the backport/36192/stable24 branch February 27, 2023 22:01
@blizzz blizzz mentioned this pull request Mar 13, 2023
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 bug feature: caldav Related to CalDAV internals feature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants