Merge pull request #8904 from MrPetovan/task/ap-conversion-admin-module

author Michael Vogel <icarus@dabo.de>

Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)

committer GitHub <noreply@github.com>

Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)
author Michael Vogel <icarus@dabo.de>
Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)
committer GitHub <noreply@github.com>
Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)
diff --cc src/Protocol/ActivityPub/Processor.php
Simple merge
diff --cc src/Protocol/ActivityPub/Receiver.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)
committer	GitHub <noreply@github.com>
	Tue, 21 Jul 2020 19:32:06 +0000 (21:32 +0200)
		1	2
src/Protocol/ActivityPub/Processor.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/ActivityPub/Receiver.php	patch \|	diff1 \|	diff2 \|	blob \| history