Merge pull request #5906 from annando/ap-switch

author Hypolite Petovan <hypolite@mrpetovan.com>

Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)

committer GitHub <noreply@github.com>

Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)
author Hypolite Petovan <hypolite@mrpetovan.com>
Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)
committer GitHub <noreply@github.com>
Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)
diff --cc boot.php
Simple merge
diff --cc src/Protocol/ActivityPub/Processor.php
Simple merge
diff --cc src/Protocol/ActivityPub/Receiver.php
Simple merge
author	Hypolite Petovan <hypolite@mrpetovan.com>
	Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)
committer	GitHub <noreply@github.com>
	Sun, 14 Oct 2018 16:04:52 +0000 (12:04 -0400)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/ActivityPub/Processor.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/ActivityPub/Receiver.php	patch \|	diff1 \|	diff2 \|	blob \| history