Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations

author lain <lain@soykaf.club>

Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)

committer lain <lain@soykaf.club>

Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
author lain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
committer lain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
committer	lain <lain@soykaf.club>
	Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
		1	2
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/mastodon_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history