summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-11-29 10:17:59 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-11-29 10:17:59 +0300
commit52cc7de82cf3aa637d599edc357909be8c9366eb (patch)
tree3331c84530c0d93c41171f83c6270c8d499f5195 /mix.exs
parentc8d3c3bfeca66d16846f97b50328e0718cfe5fef (diff)
parentd7b40dd4ba5bf3890be8a8b69d5aff84f5ffc5d2 (diff)
downloadpleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.tar.gz
pleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.zip
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts: # mix.lock
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 47f237d99..7c8e52a67 100644
--- 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"},