Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 3974885848fbc8ccba3887f5673ae3b99ca1cf7d,72dfbedd0faca9c4ce3c887a14cce8b604f36099..421649e6fe982b130bc8a8e8935c198f2d356daa
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -24,7 -24,7 +24,8 @@@ The format is based on [Keep a Changelo
  - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
  - The site title is now injected as a `title` tag like preloads or metadata.
  - Password reset tokens now are not accepted after a certain age.
+ - Mix tasks to help with displaying and removing ConfigDB entries. See `mix pleroma.config`
 +- OAuth form improvements: users are remembered by their cookie, the CSS is overridable by the admin, and the style has been improved.
  
  <details>
    <summary>API Changes</summary>

diff --cc test/pleroma/web/admin_api/controllers/config_controller_test.exs
Simple merge