Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
authorMaxim Filippov <colixer@gmail.com>
Fri, 8 Nov 2019 09:30:49 +0000 (18:30 +0900)
committerMaxim Filippov <colixer@gmail.com>
Fri, 8 Nov 2019 09:30:49 +0000 (18:30 +0900)
commitb14bf9044fd99fe31dd6aa987d9fc535e3bc0218
tree93b28dac59a093638427b31efdd8200fcb6e51bb
parent7258db023e88d5aee5eac06525c42dcb073abd46
parent278674223d36f4d789dce92cd541c47b7e19b674
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs