Merge branch 'develop' into issue/1383

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc mix.exs
index 76bf2848e9ef6c4d6e52f621bf01ba417a392ef1,ea6b29f57d1f9aa22513499add2efc4cee6c29a3..8f8616f18338a01a730626b43a36b60cb8f8cfae
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -101,9 -101,10 +101,9 @@@ defmodule Pleroma.Mixfile d
        {:phoenix_pubsub, "~> 1.1"},
        {:phoenix_ecto, "~> 4.0"},
        {:ecto_enum, "~> 1.4"},
-       {:ecto_sql, "~> 3.2"},
+       {:ecto_sql, "~> 3.3.2"},
        {:postgrex, ">= 0.13.5"},
--      {:oban, "~> 0.12.0"},
 -      {:quantum, "~> 2.3"},
++      {:oban, "~> 0.12.1"},
        {:gettext, "~> 0.15"},
        {:comeonin, "~> 4.1.1"},
        {:pbkdf2_elixir, "~> 0.12.3"},

diff --cc mix.lock
Simple merge