diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-09-11 14:13:38 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-09-11 14:13:38 -0500 |
commit | 9733c9d06563a92e4c58ac906c5f98b617b9e731 (patch) | |
tree | abbf03ddb917c1c203cb79eab64647d3af541fff /mix.exs | |
parent | dfb831ca39db3098d6d585448a6ff8e938e51e8c (diff) | |
parent | 9fb88c814ddadd9138ef29550a856938491a1ca4 (diff) | |
download | pleroma-9733c9d06563a92e4c58ac906c5f98b617b9e731.tar.gz pleroma-9733c9d06563a92e4c58ac906c5f98b617b9e731.zip |
Merge remote-tracking branch 'upstream/develop' into chat-moderation
Diffstat (limited to 'mix.exs')
-rw-r--r-- | mix.exs | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.1.1"), + version: version("2.1.50"), elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), @@ -134,7 +134,9 @@ defmodule Pleroma.Mixfile do {:cachex, "~> 3.2"}, {:poison, "~> 3.0", override: true}, {:tesla, - github: "teamon/tesla", ref: "af3707078b10793f6a534938e56b963aff82fe3c", override: true}, + git: "https://github.com/teamon/tesla/", + ref: "9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30", + override: true}, {:castore, "~> 0.1"}, {:cowlib, "~> 2.9", override: true}, {:gun, @@ -178,7 +180,7 @@ defmodule Pleroma.Mixfile do {:flake_id, "~> 0.1.0"}, {:concurrent_limiter, git: "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git", - ref: "55e92f84b4ed531bd487952a71040a9c69dc2807"}, + ref: "d81be41024569330f296fc472e24198d7499ba78"}, {:remote_ip, git: "https://git.pleroma.social/pleroma/remote_ip.git", ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"}, |