Merge branch 'develop' into issue/1383

diff --cc config/config.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

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

diff --cc mix.exs
index 72e37cfe65176853e50711a444b73144f6b78283,eb2e54e4ab0575afff184726cfbf55e8b017766a..618864effb87f1ba29c1182b560fd6c2bc895e40
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -101,7 -101,9 +101,8 @@@ defmodule Pleroma.Mixfile d
        {:phoenix_pubsub, "~> 1.1"},
        {:phoenix_ecto, "~> 4.0"},
        {:ecto_sql, "~> 3.2"},
-       {:oban, "~> 0.11.1"},
+       {:postgrex, ">= 0.13.5"},
+       {:oban, "~> 0.12.0"},
 -      {:quantum, "~> 2.3"},
        {:gettext, "~> 0.15"},
        {:comeonin, "~> 4.1.1"},
        {:pbkdf2_elixir, "~> 0.12.3"},

diff --cc mix.lock
Simple merge