Merge branch 'develop' into feature/report-notes
authorMaxim Filippov <colixer@gmail.com>
Wed, 11 Dec 2019 23:16:23 +0000 (02:16 +0300)
committerMaxim Filippov <colixer@gmail.com>
Wed, 11 Dec 2019 23:16:23 +0000 (02:16 +0300)
commit3ecf131511afc1fc366be6402ca94cf0e6c30e11
tree0e8a59c43ccc344bb7d57c32826675aa706b7e8e
parentcc36a8ea906bd22884101632c6d62c9572e846e1
parentfd697cf2090b61db60a02694c3227850df176e2d
Merge branch 'develop' into feature/report-notes
CHANGELOG.md
docs/API/admin_api.md
lib/pleroma/activity.ex
lib/pleroma/pagination.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/views/report_view.ex
lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs