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

diff --cc CHANGELOG.md
index cedba088c3eb43c4c525bb67d9a7a6e03ad7848d,230888bbf6568c920a2166b26d4cebee85125acf..c6bf38ee02fdb2e3a1f75f16cb4577ea7e302c11
--- 1/CHANGELOG.md
--- 2/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
  

diff --cc lib/mix/tasks/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/emails/user_email.ex
Simple merge

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

diff --cc test/mix/tasks/pleroma/user_test.exs
Simple merge

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