Merge develop

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
Simple merge

diff --cc docs/config.md
Simple merge

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

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

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc mix.exs
index 25332deb9ae22fc1dc5c789aa8cf466feeb37d50,c12b0a500d33bf924de383b0a5a02fc00ac80c49..0eb92bb12c525d40e5f968347c056724f345b97d
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -139,9 -138,8 +139,9 @@@ defmodule Pleroma.Mixfile d
         ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
        {:http_signatures,
         git: "https://git.pleroma.social/pleroma/http_signatures.git",
-        ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
+        ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
 -      {:pleroma_job_queue, "~> 0.2.0"},
 +      {:pleroma_job_queue,
 +       git: "https://git.pleroma.social/pleroma/pleroma_job_queue.git", ref: "0637ccb1"},
        {:telemetry, "~> 0.3"},
        {:prometheus_ex, "~> 3.0"},
        {:prometheus_plugs, "~> 1.1"},

diff --cc mix.lock
Simple merge

diff --cc test/user_test.exs
Simple merge