diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-06-04 12:41:24 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-06-04 12:41:24 +0300 |
| commit | 96121315f3e9aebc57d36a669fc4003905cd0ba6 (patch) | |
| tree | df71ff81e2acecdfd477fd843670e5e1e6b271a8 | |
| parent | 4f2e359687b8866a26130314315415a787678881 (diff) | |
| download | pleroma-96121315f3e9aebc57d36a669fc4003905cd0ba6.tar.gz | |
fix merge
| -rw-r--r-- | docs/api/differences_in_mastoapi_responses.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md index 88a43de38..623d4fbf5 100644 --- a/docs/api/differences_in_mastoapi_responses.md +++ b/docs/api/differences_in_mastoapi_responses.md @@ -90,7 +90,6 @@ Pleroma has mechanism that allows frontends to save blobs of json for each user The parameter should have a form of `{frontend_name: {...}}`, with `frontend_name` identifying your type of client, e.g. `pleroma_fe`. It will overwrite everything under this property, but will not overwrite other frontend's settings. This information is returned in the `verify_credentials` endpoint. ->>>>>>> develop ## Authentication |