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

diff --cc CHANGELOG.md
index c52d2eef5c67587d6f0f0beeada7697cf1e74c5d,95f3185847beb8cf1a374374ca17d2b89a669a4f..7d5256600df8986d5e5995d8667feddb28f0341b
--- 1/CHANGELOG.md
--- 2/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>

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

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

diff --cc test/user_test.exs
Simple merge