Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

# Conflicts:
#	CHANGELOG.md
#	config/config.exs

diff --cc CHANGELOG.md
index e0ab69d8b2a2a3f1289e09a50180338d2ea16349,90791d7bd549defb4512eaa4eaac024dbd50047f..2ab09859140ed70cda3ed0b69b3d87aec3cc5cd9
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -74,7 -74,7 +74,8 @@@ The format is based on [Keep a Changelo
  - User settings: Add _This account is a_ option.
  - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
+ - Add an option `authorized_fetch_mode` to require HTTP signatures for AP fetches.
 +- ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
  <details>
    <summary>API Changes</summary>
  
@@@ -116,7 -116,7 +117,8 @@@
  - Configuration: `feed.logo` option for tag feed.
  - Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  - Mastodon API: Add `reacted` property to `emoji_reactions`
+ - Pleroma API: Add reactions for a single emoji.
 +- ActivityPub: `[:activitypub, :note_replies_output_limit]` setting sets the number of note self-replies to output on outgoing federation.
  </details>
  
  ### Fixed

diff --cc config/config.exs
index c5a56b14d0cc3a892d7ce2303a53ebebb5b70340,641b2c8673dfd56ef854d71a6e5e02d26c93ceda..a92130ec86ebcef8f1bd42d3848c24e6a6500c4d
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -326,8 -326,8 +326,9 @@@ config :pleroma, :activitypub
    unfollow_blocked: true,
    outgoing_blocks: true,
    follow_handshake_timeout: 500,
-   sign_object_fetches: true
 +  note_replies_output_limit: 5,
+   sign_object_fetches: true,
+   authorized_fetch_mode: false
  
  config :pleroma, :streamer,
    workers: 3,