Merge branch 'develop' into feature/gen-magic

2020-10-09 11:26:10 -05:00 · 2020-10-09 11:26:10 -05:00 · 04b514c567
commit 04b514c567
parent 55562ca936 d239bd3ca4
239 changed files with 8638 additions and 2322 deletions
--- a/mix.exs
+++ b/mix.exs
@ -122,7 +122,7 @@ defmodule Pleroma.Mixfile do
      {:ecto_enum, "~> 1.4"},
      {:ecto_sql, "~> 3.4.4"},
      {:postgrex, ">= 0.15.5"},
-      {:oban, "~> 2.0.0"},
+      {:oban, "~> 2.1.0"},
      {:gettext, "~> 0.18"},
      {:pbkdf2_elixir, "~> 1.2"},
      {:bcrypt_elixir, "~> 2.2"},