diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-04 13:30:14 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-04 13:30:14 +0400 |
| commit | 70f054b0836e81e5c3572634af56c9deb03d2ae0 (patch) | |
| tree | b1085099d186de49c25aeb2085a9152b5c49a52c /docs | |
| parent | 68cb152a0861618035ac48a0e0b455f74d9b767c (diff) | |
| parent | d6693a91028ab3ee7865f530f3ad2532542fc2d2 (diff) | |
| download | pleroma-70f054b0836e81e5c3572634af56c9deb03d2ae0.tar.gz | |
Merge branch 'develop' into openapi/admin/relay
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/API/admin_api.md | 4 | ||||
| -rw-r--r-- | docs/clients.md | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index 639c3224d..92816baf9 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -547,7 +547,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ```json { - "totalReports" : 1, + "total" : 1, "reports": [ { "account": { @@ -768,7 +768,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret - 400 Bad Request `"Invalid parameters"` when `status` is missing - On success: `204`, empty response -## `POST /api/pleroma/admin/reports/:report_id/notes/:id` +## `DELETE /api/pleroma/admin/reports/:report_id/notes/:id` ### Delete report note diff --git a/docs/clients.md b/docs/clients.md index 7f98dc7b1..ea751637e 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -42,6 +42,12 @@ Feel free to contact us to be added to this list! - Platforms: SailfishOS - Features: No Streaming +### Husky +- Source code: <https://git.mentality.rip/FWGS/Husky> +- Contact: [@Husky@enigmatic.observer](https://enigmatic.observer/users/Husky) +- Platforms: Android +- Features: No Streaming, Emoji Reactions, Text Formatting, FE Stickers + ### Nekonium - Homepage: [F-Droid Repository](https://repo.gdgd.jp.net/), [Google Play](https://play.google.com/store/apps/details?id=com.apps.nekonium), [Amazon](https://www.amazon.co.jp/dp/B076FXPRBC/) - Source: <https://gogs.gdgd.jp.net/lin/nekonium> |