Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
authorMaxim Filippov <colixer@gmail.com>
Mon, 4 Nov 2019 23:12:48 +0000 (02:12 +0300)
committerMaxim Filippov <colixer@gmail.com>
Mon, 4 Nov 2019 23:12:48 +0000 (02:12 +0300)
commit43ea16870fe60578a6528e1f01bfaab68943a1bc
tree108e2d85abfa60cea3b85cd07e0b2ab467b39668
parent24eecc3cb4a35376124b1fc792183d8b8dd0a9cc
parentfee127696308dbec9cff6b2a9b399cf2877cf445
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/admin_api/admin_api_controller_test.exs
test/web/common_api/common_api_test.exs