From: lain <lain@soykaf.club>
Date: Wed, 23 Sep 2020 11:49:19 +0000 (+0000)
Subject: Merge branch 'develop' into 'issue/2115'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=436d1a3c41fc92183efffb81cc041ca270025d02;p=akkoma

Merge branch 'develop' into 'issue/2115'

# Conflicts:
#   CHANGELOG.md
---

436d1a3c41fc92183efffb81cc041ca270025d02
diff --cc CHANGELOG.md
index e0982b83c,b17a0e999..5f5d01af3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -29,7 -28,7 +28,9 @@@ The format is based on [Keep a Changelo
  switched to a new configuration mechanism, however it was not officially removed until now.
  
  ### Fixed
++
 +- Add documented-but-missing chat pagination.
+ - Allow sending out emails again.
  
  ## [2.1.2] - 2020-09-17