Merge remote-tracking branch 'upstream/develop' into push-pull

author Michael <heluecht@pirati.ca>

Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)

committer Michael <heluecht@pirati.ca>

Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
author Michael <heluecht@pirati.ca>
Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
committer Michael <heluecht@pirati.ca>
Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
diff --cc src/Protocol/ActivityPub/Processor.php
Simple merge
diff --cc src/Protocol/ActivityPub/Receiver.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
committer	Michael <heluecht@pirati.ca>
	Tue, 3 Mar 2020 06:55:13 +0000 (06:55 +0000)
		1	2
src/Protocol/ActivityPub/Processor.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/ActivityPub/Receiver.php	patch \|	diff1 \|	diff2 \|	blob \| history