Merge branch 'develop' into gun

diff --cc CHANGELOG.md
index 3eb4f0bdf127ff6b2bb8ab9f9c926ec1610788c1,12f7e8fab9e66d485c1677454a5232297d123986..7afe5c21bdbd35fa914575fc373e1b096fad7bc1
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -74,8 -74,9 +74,10 @@@ 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]`).
 +- New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
  - 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).
+ - Mix task to refresh counter cache (`mix pleroma.refresh_counter_cache`)
  <details>
    <summary>API Changes</summary>
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

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

diff --cc lib/mix/tasks/pleroma/emoji.ex
Simple merge

diff --cc lib/pleroma/object/fetcher.ex
Simple merge

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge

diff --cc test/web/push/impl_test.exs
Simple merge