Merge pull request #8044 from annando/contact-adding

author Philipp <admin+Github@philipp.info>

Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)

committer GitHub <noreply@github.com>

Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)
author Philipp <admin+Github@philipp.info>
Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)
committer GitHub <noreply@github.com>
Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)
diff --cc src/Model/Contact.php
Simple merge
diff --cc src/Model/GContact.php
Simple merge
diff --cc src/Protocol/Diaspora.php
Simple merge
author	Philipp <admin+Github@philipp.info>
	Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)
committer	GitHub <noreply@github.com>
	Wed, 1 Jan 2020 19:38:34 +0000 (20:38 +0100)
		1	2
src/Model/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/GContact.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/Diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history