diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-11 08:24:36 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-11 08:24:36 +0300 |
| commit | 3d7cd993168a273ff91f826ff920a81a54274022 (patch) | |
| tree | 17a9a7b9a218224d6240f6df468dee033178fd53 /docs/API | |
| parent | f8bd85fb7e9a62a25e572c8a625b472ff7a927b9 (diff) | |
| parent | 94e5ca11054567e0edc15ef3a350f02c386d3ead (diff) | |
| download | pleroma-3d7cd993168a273ff91f826ff920a81a54274022.tar.gz | |
Merge branch 'develop' into issue/1469
Diffstat (limited to 'docs/API')
| -rw-r--r-- | docs/API/admin_api.md | 1 | ||||
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index e445583cb..fb6dfcb08 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -689,7 +689,6 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret - Response: - On failure: - 400 Bad Request `"To use this endpoint you need to enable configuration from database."` - - 400 Bad Request `"To use configuration from database migrate your settings to database."` ```json { diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 82d967e4d..89245261c 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -101,7 +101,7 @@ The `type` value is `move`. Has an additional field: - `target`: new account -### EmojiReaction Notification +### EmojiReact Notification The `type` value is `pleroma:emoji_reaction`. Has these fields: |