Merge branch 'develop' into openapi/admin/relay
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Jun 2020 14:50:37 +0000 (18:50 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Jun 2020 14:50:37 +0000 (18:50 +0400)
commit68cb152a0861618035ac48a0e0b455f74d9b767c
treecb2f14ed088efa0ab5b6952ee7d74d69f524387a
parentcbcd592300673582e38d0bf539dcdb9a2c1985a1
parent879304dcd94c778b3cdaa2b82f69fccf2b37090c
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