diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-26 22:23:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-26 22:23:05 +0300 |
| commit | 4134abef63e1165f5701741c1012e64cb908654c (patch) | |
| tree | bf531d2f464297c46edeaaf02e6966c1695934a5 /mix.exs | |
| parent | cbb19d0e1882f5ce641f30b51d7156336f81aba9 (diff) | |
| parent | e4f1d8f48c85b8a388d6c3945db157de5ce588c5 (diff) | |
| download | pleroma-4134abef63e1165f5701741c1012e64cb908654c.tar.gz pleroma-4134abef63e1165f5701741c1012e64cb908654c.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -158,7 +158,7 @@ defmodule Pleroma.Mixfile do {:floki, "~> 0.27"}, {:timex, "~> 3.6"}, {:ueberauth, "~> 0.4"}, - {:linkify, "~> 0.4.0"}, + {:linkify, "~> 0.4.1"}, {:http_signatures, "~> 0.1.0"}, {:telemetry, "~> 0.3"}, {:poolboy, "~> 1.5"}, @@ -211,7 +211,7 @@ defmodule Pleroma.Mixfile do git: "https://git.pleroma.social/pleroma/elixir-libraries/hackney.git", ref: "7d7119f0651515d6d7669c78393fd90950a3ec6e", override: true}, - {:mox, "~> 0.5", only: :test}, + {:mox, "~> 1.0", only: :test}, {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test} ] ++ oauth_deps() end |