diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:32:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:36:04 +0300 |
| commit | 1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch) | |
| tree | 3d613f7c6129f667ea16aedfe46259d9ca6bde29 /mix.exs | |
| parent | 73ae38ca04df02656bfb239ceba4ffe64879e927 (diff) | |
| parent | 50ab06435353144582f6afbf37402aef13c2b3f1 (diff) | |
| download | pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -159,6 +159,9 @@ defmodule Pleroma.Mixfile do {:plug_static_index_html, "~> 1.0.0"}, {:excoveralls, "~> 0.11.1", only: :test}, {:flake_id, "~> 0.1.0"}, + {:remote_ip, + git: "https://git.pleroma.social/pleroma/remote_ip.git", + ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"}, {:mox, "~> 0.5", only: :test} ] ++ oauth_deps() end |
