Merge branch 'develop' into issue/1383

2019-11-28 21:26:56 +03:00 · 2019-11-28 21:26:56 +03:00 · b7c449118b
commit b7c449118b
parent 1403a1441d ca1acfa314
32 changed files with 510 additions and 211 deletions
--- a/mix.exs
+++ b/mix.exs
@ -101,7 +101,8 @@ defmodule Pleroma.Mixfile do
      {:phoenix_pubsub, "~> 1.1"},
      {:phoenix_ecto, "~> 4.0"},
      {:ecto_sql, "~> 3.2"},
-      {:oban, "~> 0.11.1"},
+      {:postgrex, ">= 0.13.5"},
+      {:oban, "~> 0.12.0"},
      {:gettext, "~> 0.15"},
      {:comeonin, "~> 4.1.1"},
      {:pbkdf2_elixir, "~> 0.12.3"},