Merge pull request #31943 from nextcloud/dav-cleanup

author Carl Schwan <carl@carlschwan.eu>

Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)

committer GitHub <noreply@github.com>

Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)
author Carl Schwan <carl@carlschwan.eu>
Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)
committer GitHub <noreply@github.com>
Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)
diff --cc apps/dav/lib/CardDAV/CardDavBackend.php
Simple merge
diff --cc apps/dav/lib/CardDAV/SyncService.php
Simple merge
diff --cc build/psalm-baseline.xml
Simple merge
author	Carl Schwan <carl@carlschwan.eu>
	Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)
committer	GitHub <noreply@github.com>
	Tue, 17 May 2022 12:59:59 +0000 (14:59 +0200)
		1	2
apps/dav/lib/CardDAV/CardDavBackend.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/dav/lib/CardDAV/SyncService.php	patch \|	diff1 \|	diff2 \|	blob \| history
build/psalm-baseline.xml	patch \|	diff1 \|	diff2 \|	blob \| history