Merge branch 'develop' into feature/admin-api-status-count-per-instance
authorRoman Chvanikov <chvanikoff@pm.me>
Mon, 18 May 2020 08:56:27 +0000 (11:56 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Mon, 18 May 2020 08:56:27 +0000 (11:56 +0300)
commit01bd6a1e54c8734e8965f153a9406cecc07950f3
tree791348626f54b390167693da8c1a6481c54d78de
parent8a383707ae143ba47fa1ba68da20bc6bec425126
parent1199cf3a788334cd3fdb968d9f736e43c1401da1
Merge branch 'develop' into feature/admin-api-status-count-per-instance
CHANGELOG.md
lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs