Merge branch 'develop' into 'issue/1975'

# Conflicts:
#   CHANGELOG.md

diff --combined CHANGELOG.md
index 8ea66844db4f6df543c5ba8e8d9ab5756088e833,0dc098f80e6b4a2cca0ee79b64157bd9cf02e17b..b17a0e999d8a5c2cbfd326e7c062ed2fdb07e5e3
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,6 -5,9 +5,6 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
 -### Added
 -- Experimental websocket-based federation between Pleroma instances.
 -
  ### Changed
  
  - Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
@@@ -16,8 -19,6 +16,8 @@@
  ### 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.
 +- Experimental websocket-based federation between Pleroma instances.
 +- Admin API: Importing emoji from a zip file
  
  ### Removed
  
@@@ -27,6 -28,10 +27,9 @@@
  - 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.
  
 -
+ ### Fixed
+ - Allow sending out emails again.
+ 
  ## [2.1.2] - 2020-09-17
  
  ### Security