Merge branch 'openapi/admin/status' into 'develop'

author lain <lain@soykaf.club>

Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)

committer lain <lain@soykaf.club>

Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)
author lain <lain@soykaf.club>
Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)
committer lain <lain@soykaf.club>
Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)
committer	lain <lain@soykaf.club>
	Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)
		1	2
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/admin_api/controllers/admin_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history