Merge pull request #20139 from nextcloud/unify-default-value-for-restricting-user...

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)

committer GitHub <noreply@github.com>

Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)
committer GitHub <noreply@github.com>
Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)
diff --cc apps/dav/lib/CardDAV/SystemAddressbook.php
Simple merge
diff --cc lib/private/Contacts/ContactsMenu/ContactsStore.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)
committer	GitHub <noreply@github.com>
	Sat, 4 Apr 2020 08:33:04 +0000 (10:33 +0200)
		1	2
apps/dav/lib/CardDAV/SystemAddressbook.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/Contacts/ContactsMenu/ContactsStore.php	patch \|	diff1 \|	diff2 \|	blob \| history