Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index a39cade7db7616451525600fd31b643caa1e60e5,c4f3867a26d3d8797b0c4e5bcb8cd79ab8de6735..47c5078b8f953c222621c41249c164334f2d6375
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -20,7 -20,7 +20,8 @@@ The format is based on [Keep a Changelo
  - 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 verified with the included sample script
 +- Extracted object hashtags into separate table in order to improve hashtag timeline performance (via background migration in `Pleroma.Migrators.HashtagsTableMigrator`). 
  
  ### Added
  

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
Simple merge

diff --cc test/pleroma/web/common_api_test.exs
Simple merge