Merge remote-tracking branch 'upstream/develop' into write-tags

author Michael <heluecht@pirati.ca>

Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)

committer Michael <heluecht@pirati.ca>

Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)
author Michael <heluecht@pirati.ca>
Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)
committer Michael <heluecht@pirati.ca>
Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)
diff --cc src/Model/Item.php
Simple merge
diff --cc src/Protocol/ActivityPub/Transmitter.php
Simple merge
diff --cc src/Protocol/Diaspora.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)
committer	Michael <heluecht@pirati.ca>
	Tue, 28 Apr 2020 08:03:26 +0000 (08:03 +0000)
		1	2
src/Model/Item.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/ActivityPub/Transmitter.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Protocol/Diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history