Merge branch 'develop' into issue/1276

diff --cc CHANGELOG.md
Simple merge

diff --cc docs/API/differences_in_mastoapi_responses.md
index 01be7787f5d5828d78ba7604e7f68252aab34d29,1059155cfccba73ec292a048f7fd5c13fbd3f9ed..0a7520f9e2e113ff9bc8e8e3e457def06c6c8fdf
--- 1/docs/API/differences_in_mastoapi_responses.md
--- 2/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

diff --cc test/notification_test.exs
Simple merge