From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 7 Apr 2020 11:09:43 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1276
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2b7d7bbd2dc3121488592a958c29ba6a418e0104;p=akkoma

Merge branch 'develop' into issue/1276
---

2b7d7bbd2dc3121488592a958c29ba6a418e0104
diff --cc docs/API/differences_in_mastoapi_responses.md
index 01be7787f,1059155cf..0a7520f9e
--- a/docs/API/differences_in_mastoapi_responses.md
+++ b/docs/API/differences_in_mastoapi_responses.md
@@@ -181,14 -184,9 +184,16 @@@ Post here request with `grant_type=refr
  `POST /api/v1/accounts`
  
  Has theses additional parameters (which are the same as in Pleroma-API):
-     * `fullname`: optional
-     * `bio`: optional
-     * `captcha_solution`: optional, contains provider-specific captcha solution,
-     * `captcha_token`: optional, contains provider-specific captcha token
-     * `token`: invite token required when the registerations aren't public.
+ 
 -- `fullname`: optional
 -- `bio`: optional
 -- `captcha_solution`: optional, contains provider-specific captcha solution,
 -- `captcha_token`: optional, contains provider-specific captcha token
 -- `token`: invite token required when the registrations aren't public.
++ `fullname`: optional
++ `bio`: optional
++ `captcha_solution`: optional, contains provider-specific captcha solution,
++ `captcha_token`: optional, contains provider-specific captcha token
++ `token`: invite token required when the registrations aren't public.
++
 +
 +## Markers
 +
 +Has these additional fields under the `pleroma` object:
 +
 +- `unread_count`: contains number unread notifications