Merge branch 'develop' into issue/1276-2

diff --cc CHANGELOG.md
Simple merge

diff --cc docs/API/differences_in_mastoapi_responses.md
index a62719c5d0bf558e12deadce03b3144cb4bc6930,c099eb1a0395e6db410f5c3ff5b2143dca3e0b93..8d1da936f4e6aa4d238013a3eb6671f4905d5490
--- 1/docs/API/differences_in_mastoapi_responses.md
--- 2/docs/API/differences_in_mastoapi_responses.md
+++ b/docs/API/differences_in_mastoapi_responses.md
@@@ -202,11 -202,19 +202,25 @@@ Has theses additional parameters (whic
  - `bio`: optional
  - `captcha_solution`: optional, contains provider-specific captcha solution,
  - `captcha_token`: optional, contains provider-specific captcha token
+ - `captcha_answer_data`: optional, contains provider-specific captcha data
  - `token`: invite token required when the registrations aren't public.
  
+ ## Instance
+ 
+ `GET /api/v1/instance` has additional fields
+ 
+ - `max_toot_chars`: The maximum characters per post
+ - `poll_limits`: The limits of polls
+ - `upload_limit`: The maximum upload file size
+ - `avatar_upload_limit`: The same for avatars
+ - `background_upload_limit`: The same for backgrounds
+ - `banner_upload_limit`: The same for banners
+ - `pleroma.metadata.features`: A list of supported features
+ - `pleroma.metadata.federation`: The federation restrictions of this instance
+ - `vapid_public_key`: The public key needed for push messages
 +
 +## Markers
 +
 +Has these additional fields under the `pleroma` object:
 +
 +- `unread_count`: contains number unread notifications

diff --cc lib/pleroma/notification.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge