Merge branch 'develop' into issue/1383

2019-12-08 19:52:46 +03:00 · 2019-12-08 19:52:46 +03:00 · 5876a9cb79
commit 5876a9cb79
parent 3c3bba0b7c af5fef1f22
55 changed files with 1159 additions and 417 deletions
--- a/mix.exs
+++ b/mix.exs
@ -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"},