Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

author Michael <heluecht@pirati.ca>

Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)

committer Michael <heluecht@pirati.ca>

Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)
author Michael <heluecht@pirati.ca>
Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)
committer Michael <heluecht@pirati.ca>
Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)
diff --cc mod/contacts.php
Simple merge
diff --cc src/Network/Probe.php
Simple merge
diff --cc src/Protocol/Diaspora.php
Simple merge
diff --cc src/Protocol/PortableContact.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)
committer	Michael <heluecht@pirati.ca>
	Sat, 15 Sep 2018 20:49:46 +0000 (20:49 +0000)
		1	2
mod/contacts.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Network/Probe.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/Diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/PortableContact.php	patch \|	diff1 \|	diff2 \|	blob \| history