diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-10 08:55:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-10 08:55:14 +0300 |
| commit | 835ac2157c53e8c85bd3759efe061dbfbdfc367e (patch) | |
| tree | 266959488004bd33200c4ae4d664e665b77b2668 /mix.exs | |
| parent | 1770602747ae95d95d12c5601f99ced8699e8947 (diff) | |
| parent | 99623b4eca8ad4af0b8e7adc9dd4765ba2922c8b (diff) | |
| download | pleroma-835ac2157c53e8c85bd3759efe061dbfbdfc367e.tar.gz pleroma-835ac2157c53e8c85bd3759efe061dbfbdfc367e.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -100,6 +100,7 @@ defmodule Pleroma.Mixfile do {:plug_cowboy, "~> 2.0"}, {:phoenix_pubsub, "~> 1.1"}, {:phoenix_ecto, "~> 4.0"}, + {:ecto_enum, "~> 1.4"}, {:ecto_sql, "~> 3.2"}, {:postgrex, ">= 0.13.5"}, {:oban, "~> 0.12.0"}, |