Merge branch 'develop' into issue/2099

diff --cc CHANGELOG.md
index 5abafdf6911949226a9b355da11cb2f2c3d9c6d7,5a7e27fd3ab3e184a757014e3f09abed73951f69..e61b1d14443ac71247cea97215b5b3b13138d645
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -13,6 -16,9 +16,10 @@@ The format is based on [Keep a Changelo
  - Users with the `discoverable` field set to false will not show up in searches.
  - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
  
+ ### Added
+ - Media preview proxy (requires media proxy be enabled; see `:media_preview_proxy` config for more details).
++- Pleroma API: Importing the mutes users from CSV files.
+ 
  ### Removed
  
  - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation).
@@@ -21,9 -27,6 +28,7 @@@
  - Removed `:managed_config` option. In practice, it was accidentally removed with 2.0.0 release when frontends were
  switched to a new configuration mechanism, however it was not officially removed until now.
  
- ### Added
- - Pleroma API: Importing the mutes users from CSV files.
 +
  ## [2.1.2] - 2020-09-17
  
  ### Security

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

diff --cc lib/pleroma/web/router.ex
Simple merge