From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 17 Dec 2020 15:04:43 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/develop' into registration-workflow
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=80891e83d8df25b742a321d2c837e38c805e6582;hp=--cc;p=akkoma

Merge remote-tracking branch 'upstream/develop' into registration-workflow
---

80891e83d8df25b742a321d2c837e38c805e6582
diff --cc CHANGELOG.md
index cedba088c,230888bbf..c6bf38ee0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,8 -10,8 +10,10 @@@ The format is based on [Keep a Changelo
  
  - 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.
 +- **Breaking:** Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
+ - 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.
  
  ### Added