Merge branch 'develop' into docs/apache-config

diff --combined CHANGELOG.md
index fea8b92dea14cb92981712f0a0fbb76529ee39bf,0ea649111d4be76caf5970ebf8f8815c9f7c9ef5..6522fbdcd1563d70b6ce6bd2f844bcb0a72765cf
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -8,9 -8,11 +8,11 @@@ The format is based on [Keep a Changelo
  
  ### Changed
  
- - **Breaking:** Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
+ - **Breaking**: Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
+ - **Breaking**: Changed `mix pleroma.user toggle_activated` to `mix pleroma.user activate/deactivate`
  - **Breaking**: AdminAPI changed User field `confirmation_pending` to `is_confirmed`
  - **Breaking**: AdminAPI changed User field `approval_pending` to `is_approved`
+ - **Breaking**: AdminAPI changed User field `deactivated` to `is_active`
  - Polls now always return a `voters_count`, even if they are single-choice.
  - Admin Emails: The ap id is used as the user link in emails now.
  - Improved registration workflow for email confirmation and account approval modes.
@@@ -18,7 -20,6 +20,7 @@@
  - Emoji: Support the full Unicode 13.1 set of Emoji for reactions, plus regional indicators.
  - Admin API: Reports now ordered by newest
  - Deprecated `Pleroma.Uploaders.S3, :public_endpoint`. Now `Pleroma.Upload, :base_url` is the standard configuration key for all uploaders.
 +- Improved Apache webserver support: updated sample configuration, MediaProxy cache invalidation now supported
  
  ### Added
  
@@@ -55,6 -56,7 +57,7 @@@
  - Streaming API: Posts and notifications are not dropped, when CLI task is executing.
  - Creating incorrect IPv4 address-style HTTP links when encountering certain numbers.
  - Reblog API Endpoint: Do not set visibility parameter to public by default and let CommonAPI to infer it from status, so a user can reblog their private status without explicitly setting reblog visibility to private.
+ - Tag URLs in statuses are now absolute
  
  <details>
    <summary>API Changes</summary>