From: lain <lain@soykaf.club>
Date: Wed, 23 Sep 2020 09:16:00 +0000 (+0000)
Subject: Merge branch 'develop' into 'issue/1975'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a6c14041c49df0dc850204723cfc1f242ded8aa2;p=akkoma

Merge branch 'develop' into 'issue/1975'

# Conflicts:
#   CHANGELOG.md
---

a6c14041c49df0dc850204723cfc1f242ded8aa2
diff --cc CHANGELOG.md
index 8ea66844d,0dc098f80..b17a0e999
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -27,6 -28,10 +27,9 @@@ The format is based on [Keep a Changelo
  - 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