Merge branch 'develop' into 'openapi/admin/relay'
authorminibikini <egor@kislitsyn.com>
Thu, 4 Jun 2020 13:29:32 +0000 (13:29 +0000)
committerminibikini <egor@kislitsyn.com>
Thu, 4 Jun 2020 13:29:32 +0000 (13:29 +0000)
commitb57e4ad1abd6fa0c0597b4343528e211c84b50c1
tree31728d70194b6e578d4fe5d9c3edcb3e31a77de8
parent70f054b0836e81e5c3572634af56c9deb03d2ae0
parentf5cb1f3616e9cb9430038697532eb49161937dec
Merge branch 'develop' into 'openapi/admin/relay'

# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
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