From: Maksim Pechnikov <parallel588@gmail.com>
Date: Thu, 28 Nov 2019 18:26:56 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b7c449118bc09ab36610e85292d153ace67c2b89;p=akkoma

Merge branch 'develop' into issue/1383
---

b7c449118bc09ab36610e85292d153ace67c2b89
diff --cc mix.exs
index 72e37cfe6,eb2e54e4a..618864eff
--- a/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"},