From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sun, 31 Jan 2021 17:38:58 +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=1b49b8efe57256b3f64b4b7e8a1de805ab030814;p=akkoma

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

# Conflicts:
#	CHANGELOG.md
---

1b49b8efe57256b3f64b4b7e8a1de805ab030814
diff --cc CHANGELOG.md
index a39cade7d,c4f3867a2..47c5078b8
--- a/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