diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-16 17:58:42 +0300 |
| commit | 0e07c5ef5717460d37336129cb657ba11091f09d (patch) | |
| tree | 801cb7957ebe2e4f227f089afc902ea2084eaf27 /docs | |
| parent | 7c8003c3fcdcab075b9722ab236bf2d1d0e0e8cd (diff) | |
| parent | b80958d4e3fb9cdbb9b10149a52f1441edb4b1e3 (diff) | |
| download | pleroma-0e07c5ef5717460d37336129cb657ba11091f09d.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 2 | ||||
| -rw-r--r-- | docs/clients.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 06de90f71..476a4a2bf 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -180,7 +180,7 @@ Post here request with grant_type=refresh_token to obtain new access token. Retu ## Account Registration `POST /api/v1/accounts` -Has theses additionnal parameters (which are the same as in Pleroma-API): +Has theses additional parameters (which are the same as in Pleroma-API): * `fullname`: optional * `bio`: optional * `captcha_solution`: optional, contains provider-specific captcha solution, diff --git a/docs/clients.md b/docs/clients.md index 8ac9ad3de..1eae0f0c6 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -1,5 +1,5 @@ # Pleroma Clients -Note: Additionnal clients may be working but theses are officially supporting Pleroma. +Note: Additional clients may be working but theses are officially supporting Pleroma. Feel free to contact us to be added to this list! ## Desktop |