Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...

diff --cc CHANGELOG.md
index 7d9b10b283877dd48c7514ee1e0b4eff2f403958,36897503ac1fa3fbfb3a0601c2353defb0a7a443..8de65d75254a7885877f4e22c8699baf0168e0a4
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -17,11 -15,59 +15,59 @@@ The format is based on [Keep a Changelo
  <details>
    <summary>API Changes</summary>
  - Mastodon API: Support for `include_types` in `/api/v1/notifications`.
+ - Mastodon API: Added `/api/v1/notifications/:id/dismiss` endpoint.
  </details>
  
+ ### Fixed
+ - Support pagination in conversations API
+ 
+ ## [unreleased-patch]
+ 
+ ## [2.0.2] - 2020-04-08
+ ### Added
+ - Support for Funkwhale's `Audio` activity
+ - Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
+ 
+ ### Fixed
+ - Blocked/muted users still generating push notifications
+ - Input textbox for bio ignoring newlines
+ - OTP: Inability to use PostgreSQL databases with SSL
+ - `user delete_activities` breaking when trying to delete already deleted posts
+ - Incorrect URL for Funkwhale channels
+ 
+ ### Upgrade notes
+ 1. Restart Pleroma
+ 
+ ## [2.0.1] - 2020-03-15
+ ### Security
+ - Static-FE: Fix remote posts not being sanitized
+ 
+ ### Fixed
+ - 500 errors when no `Accept` header is present if Static-FE is enabled
+ - Instance panel not being updated immediately due to wrong `Cache-Control` headers
+ - Statuses posted with BBCode/Markdown having unncessary newlines in Pleroma-FE
+ - OTP: Fix some settings not being migrated to in-database config properly
+ - No `Cache-Control` headers on attachment/media proxy requests
+ - Character limit enforcement being off by 1
+ - Mastodon Streaming API: hashtag timelines not working
+ 
+ ### Changed
+ - BBCode and Markdown formatters will no longer return any `\n` and only use `<br/>` for newlines
+ - Mastodon API: Allow registration without email if email verification is not enabled
+ 
+ ### Upgrade notes
+ #### Nginx only
+ 1. Remove `proxy_ignore_headers Cache-Control;` and `proxy_hide_header  Cache-Control;` from your config.
+ 
+ #### Everyone
+ 1. Run database migrations (inside Pleroma directory):
+   - OTP: `./bin/pleroma_ctl migrate`
+   - From Source: `mix ecto.migrate`
+ 2. Restart Pleroma
+ 
  ## [2.0.0] - 2019-03-08
  ### Security
 -- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
 +- Mastodon API: Fix being able to request enormous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
  
  ### Removed
  - **Breaking**: Removed 1.0+ deprecated configurations `Pleroma.Upload, :strip_exif` and `:instance, :dedupe_media`

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

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge

diff --cc lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
Simple merge

diff --cc test/web/mastodon_api/controllers/notification_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/status_controller_test.exs
Simple merge