Merge branch 'develop' into openapi/admin/relay
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 4 Jun 2020 09:30:14 +0000 (13:30 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 4 Jun 2020 09:30:14 +0000 (13:30 +0400)
commit70f054b0836e81e5c3572634af56c9deb03d2ae0
treeb1085099d186de49c25aeb2085a9152b5c49a52c
parent68cb152a0861618035ac48a0e0b455f74d9b767c
parentd6693a91028ab3ee7865f530f3ad2532542fc2d2
Merge branch 'develop' into openapi/admin/relay
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/controllers/admin_api_controller_test.exs