Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2...

author Ivan Tashkinov <ivant.business@gmail.com>

Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)

committer Ivan Tashkinov <ivant.business@gmail.com>

Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
author Ivan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
committer Ivan Tashkinov <ivant.business@gmail.com>
Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
author	Ivan Tashkinov <ivant.business@gmail.com>
	Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
committer	Ivan Tashkinov <ivant.business@gmail.com>
	Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)
		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