Merge branch 'develop' into issue/1276

author Maksim Pechnikov <parallel588@gmail.com>

Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)

committer Maksim Pechnikov <parallel588@gmail.com>

Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)
author Maksim Pechnikov <parallel588@gmail.com>
Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)
committer Maksim Pechnikov <parallel588@gmail.com>
Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc docs/API/differences_in_mastoapi_responses.md
Simple merge
diff --cc lib/pleroma/notification.ex
Simple merge
author	Maksim Pechnikov <parallel588@gmail.com>
	Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)
committer	Maksim Pechnikov <parallel588@gmail.com>
	Mon, 10 Feb 2020 04:59:52 +0000 (07:59 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
docs/API/differences_in_mastoapi_responses.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/notification.ex	patch \|	diff1 \|	diff2 \|	blob \| history