Merge branch 'develop' into openapi/admin/config
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 4 Jun 2020 09:28:00 +0000 (13:28 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 4 Jun 2020 09:28:00 +0000 (13:28 +0400)
commitb4d5bdd6f1c473280b8b9bbad96e9efecb45b298
tree6d08f332f7bd1bc20f7bd3904987850173f90af0
parent06f20e918129b1f434783b64d59b5ae6b4b4ed51
parentd6693a91028ab3ee7865f530f3ad2532542fc2d2
Merge branch 'develop' into openapi/admin/config
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