From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 28 Jan 2020 17:34:13 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=21a2a054070c26d7be1a0e453e5f40b20fbd59f2;p=akkoma

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

21a2a054070c26d7be1a0e453e5f40b20fbd59f2
diff --cc mix.exs
index 76bf2848e,ea6b29f57..8f8616f18
--- a/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"},