From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 21 Jan 2021 17:20:35 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2634a16b4cefebfb2a13550bde3fd12e5acd9aaa;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

2634a16b4cefebfb2a13550bde3fd12e5acd9aaa
diff --cc CHANGELOG.md
index 9a053156f,e1dfeae01..29dd347a0
--- a/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