Merge branch 'explicit-addressing' into 'develop'

author kaniini <nenolod@gmail.com>

Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)

committer kaniini <nenolod@gmail.com>

Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)
author kaniini <nenolod@gmail.com>
Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)
committer kaniini <nenolod@gmail.com>
Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc docs/api/differences_in_mastoapi_responses.md
Simple merge
diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge
author	kaniini <nenolod@gmail.com>
	Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)
committer	kaniini <nenolod@gmail.com>
	Wed, 5 Jun 2019 08:28:20 +0000 (08:28 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/api/differences_in_mastoapi_responses.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/common_api/common_api.ex	patch \|	diff1 \|	diff2 \|	blob \| history