Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth...

author Ivan Tashkinov <ivantashkinov@gmail.com>

Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Wed, 15 Apr 2020 16:20:34 +0000 (19:20 +0300)
		1	2
lib/pleroma/web/mastodon_api/controllers/account_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history