diff options
| author | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
|---|---|---|
| committer | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
| commit | 54e7087ab412a488f8ad7286aef89d313e5e7b14 (patch) | |
| tree | 9391107eb5aec3940bf6150539acc38e85224751 /mix.exs | |
| parent | 9338f061a303ae3d57a8ea1af524c2ca51929f8d (diff) | |
| parent | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff) | |
| download | pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.tar.gz pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -76,7 +76,7 @@ defmodule Pleroma.Mixfile do {:ex_aws, "~> 2.0"}, {:ex_aws_s3, "~> 2.0"}, {:earmark, "~> 1.3"}, - {:ex_machina, "~> 2.2", only: :test}, + {:ex_machina, "~> 2.3", only: :test}, {:credo, "~> 0.9.3", only: [:dev, :test]}, {:mock, "~> 0.3.1", only: :test}, {:crypt, |