Merge remote-tracking branch 'upstream/develop' into aliases

diff --cc CHANGELOG.md
index ef32358049b7834f9c5bb57921e57e44f43b107f,a8e80eb3c189be2403f9326a2d467e807d55815a..71c2c03171c5ff2bae505de110e24e8d19c6ef25
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -63,7 -71,9 +71,10 @@@ 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.
 +- Ability to set ActivityPub aliases for follower migration.
+ - "By approval" registrations mode.
+ - Configuration: Added `:welcome` settings for the welcome message to newly registered users. You can send a welcome message as a direct message, chat or email.
+ - Ability to hide favourites and emoji reactions in the API with `[:instance, :show_reactions]` config.
  
  <details>
    <summary>API Changes</summary>

diff --cc docs/API/pleroma_api.md
Simple merge

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

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge