Merge pull request #31673 from nextcloud/feat/contacts-migration

author Vincent Petry <vincent@nextcloud.com>

Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)

committer GitHub <noreply@github.com>

Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)
author Vincent Petry <vincent@nextcloud.com>
Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)
committer GitHub <noreply@github.com>
Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)
diff --cc apps/dav/composer/composer/autoload_classmap.php
Simple merge
diff --cc apps/dav/composer/composer/autoload_static.php
Simple merge
author	Vincent Petry <vincent@nextcloud.com>
	Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)
committer	GitHub <noreply@github.com>
	Thu, 7 Apr 2022 15:36:53 +0000 (17:36 +0200)
		1	2
apps/dav/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/dav/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history