Merge branch 'feature/cors-again' into 'develop'

Add CORSPlug to make web-based OAuth easier.

See merge request pleroma/pleroma!420

1 files changed, 2 insertions, 1 deletions

diff --git a/mix.exs b/mix.exs
index 885df0094..427c5d810 100644
--- a/mix.exs
+++ b/mix.exs
@@ -53,7 +53,8 @@ defmodule Pleroma.Mixfile do
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test},
       {:crypt,
-       git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}
+       git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
+      {:cors_plug, "~> 1.5"}
     ]
   end