Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
authorMaxim Filippov <colixer@gmail.com>
Mon, 7 Oct 2019 12:41:41 +0000 (15:41 +0300)
committerMaxim Filippov <colixer@gmail.com>
Mon, 7 Oct 2019 12:41:41 +0000 (15:41 +0300)
commit35068baf65f1be9ac4e5ae8d08222244ae823fcc
tree0ed0b88fd100fb3df83400c147ab9a6a88d53c73
parent7aceaa517be7b109a9acc15fb4914535b536b66c
parent0a99f1e8c5551dcf170722e5087a0401b2d907af
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/router.ex
test/web/common_api/common_api_test.exs