Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
authorMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:46:18 +0000 (01:46 +0900)
committerMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:46:18 +0000 (01:46 +0900)
commit82f4e4760ed594fd858e36444dfb01f27fa8068c
tree5d246b275698438a39b6fc2a2e3662a417cb940f
parentfd24467b923bd09850979600aeb9a46f8f0c7967
parent34cdbcbb644e14dde562c150fa8ae2881e6a899b
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs