diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
commit | 01c1078015c1ddbaa195125034489a14233df206 (patch) | |
tree | 01c63b7d6a8040decf6e0cd1630b715ca2cb29c6 /docs/api/admin_api.md | |
parent | 76068873dbf9da191dd2487158ca88df198b811a (diff) | |
parent | 79376abae347a5039931f57c581074b6da859827 (diff) | |
download | pleroma-01c1078015c1ddbaa195125034489a14233df206.tar.gz |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
Diffstat (limited to 'docs/api/admin_api.md')
-rw-r--r-- | docs/api/admin_api.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index fd608c459..9362e3d78 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -317,6 +317,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ```json { + "total" : 1, "reports": [ { "account": { |