Merge branch 'develop' into feature/admin-api-user-statuses
authorMaxim Filippov <colixer@gmail.com>
Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)
committerMaxim Filippov <colixer@gmail.com>
Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)
commitf46805bb40bf29cd67acb33b6b65ed1e4e28d3e1
tree7542dbbe178183e4dd3c3451aa7744f18117fa37
parent03471151d6089e318abaf5265d42ffedf7a5b902
parent1a751529fb2cd3929e3373a908bec5db5cc32f1b
Merge branch 'develop' into feature/admin-api-user-statuses
CHANGELOG.md
docs/api/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/support/factory.ex
test/web/admin_api/admin_api_controller_test.exs