From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 27 Jul 2020 17:29:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/develop' into by-approval
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6747bf2e1642d7715a9f08469247bc99ff7165cb;p=akkoma

Merge remote-tracking branch 'upstream/develop' into by-approval
---

6747bf2e1642d7715a9f08469247bc99ff7165cb
diff --cc CHANGELOG.md
index c52d2eef5,95f318584..7d5256600
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -66,7 -67,7 +67,8 @@@ The format is based on [Keep a Changelo
  - Support pagination in emoji packs API (for packs and for files in pack)
  - Support for viewing instances favicons next to posts and accounts
  - Added Pleroma.Upload.Filter.Exiftool as an alternate EXIF stripping mechanism targeting GPS/location metadata.
 +- "By approval" registrations mode.
+ - Configuration: Added `:welcome` settings for the welcome message to newly registered users.
  
  <details>
    <summary>API Changes</summary>