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

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 9a053156fe9f89e61fb5d2c98def7e3d32448398,e1dfeae01c00199f45de696ae910d63b94627242..29dd347a00503938172f199925cbdb73a6c950cf
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -14,8 -17,7 +17,8 @@@ The format is based on [Keep a Changelo
  - Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
  - 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.
 +- Extracted object hashtags into separate table in order to improve hashtag timeline performance (via background migration in `Pleroma.Migrators.HashtagsTableMigrator`). 
  
  ### Added
  

diff --cc config/description.exs
Simple merge

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

diff --cc test/pleroma/object_test.exs
Simple merge

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