Merge branch 'develop' into issue/1934-welcome-email

2020-07-23 16:36:27 +03:00 · 2020-07-23 16:36:27 +03:00 · 67ab9a7928
commit 67ab9a7928
parent 7991ddad58 76aa49a0c5
47 changed files with 579 additions and 174 deletions
--- a/lib/pleroma/config/config_db.ex
+++ b/lib/pleroma/config/config_db.ex
@ -156,7 +156,6 @@ defmodule Pleroma.ConfigDB do
      {:quack, :meta},
      {:mime, :types},
      {:cors_plug, [:max_age, :methods, :expose, :headers]},
-      {:auto_linker, :opts},
      {:swarm, :node_blacklist},
      {:logger, :backends}
    ]