diff options
author | rinpatch <rinpatch@sdf.org> | 2020-04-16 21:28:52 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-04-16 21:28:52 +0300 |
commit | 942d7467ca28c898f914539ae85ea3044c36ebbc (patch) | |
tree | 03d909dfcf5974838919076c6ae994515b0c1f84 /mix.exs | |
parent | e89078ac2a27bb0a833c982dbb5eef63ddea3cc0 (diff) | |
parent | 252528a4b9ca3a5d92f1676c44989ad7d8777de1 (diff) | |
download | pleroma-942d7467ca28c898f914539ae85ea3044c36ebbc.tar.gz pleroma-942d7467ca28c898f914539ae85ea3044c36ebbc.zip |
Merge branch 'develop' into features/remove-user-source_data
Diffstat (limited to 'mix.exs')
-rw-r--r-- | mix.exs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -117,7 +117,7 @@ defmodule Pleroma.Mixfile do {:ecto_enum, "~> 1.4"}, {:ecto_sql, "~> 3.3.2"}, {:postgrex, ">= 0.13.5"}, - {:oban, "~> 0.12.1"}, + {:oban, "~> 1.2"}, {:gettext, "~> 0.15"}, {:comeonin, "~> 4.1.1"}, {:pbkdf2_elixir, "~> 0.12.3"}, @@ -183,7 +183,7 @@ defmodule Pleroma.Mixfile do {:flake_id, "~> 0.1.0"}, {:remote_ip, git: "https://git.pleroma.social/pleroma/remote_ip.git", - ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"}, + ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"}, {:captcha, git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"}, |