Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts: # mix.lock
2019-11-29 10:17:59 +03:00 · 2019-11-29 10:17:59 +03:00 · 52cc7de82c
commit 52cc7de82c
parent c8d3c3bfec d7b40dd4ba
18 changed files with 397 additions and 110 deletions
--- a/mix.exs
+++ b/mix.exs
@ -103,7 +103,7 @@ defmodule Pleroma.Mixfile do
      {:ecto_enum, "~> 1.4"},
      {:ecto_sql, "~> 3.2"},
      {:postgrex, ">= 0.13.5"},
-      {:oban, "~> 0.8.1"},
+      {:oban, "~> 0.12.0"},
      {:quantum, "~> 2.3"},
      {:gettext, "~> 0.15"},
      {:comeonin, "~> 4.1.1"},