X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=efdf15d3ab8a055d8454b94a8509debe4766bcbc;hb=7ac9fff437a2aee3403a769b6cdfb3533771b03e;hp=5392d94d1aec9f4560c339e4716a3f64202d5a3f;hpb=c3ac9424d2affe87df82c14dc243f507fa639343;p=akkoma

diff --git a/mix.exs b/mix.exs
index 5392d94d1..efdf15d3a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -23,11 +23,14 @@ defmodule Pleroma.Mixfile do
         logo: "priv/static/static/logo.png",
         extras: [
           "README.md",
-          "docs/config.md",
-          "docs/Pleroma-API.md",
           "docs/Admin-API.md",
           "docs/Clients.md",
-          "docs/Differences-in-MastodonAPI-Responses.md"
+          "docs/config.md",
+          "docs/Custom-Emoji.md",
+          "docs/Differences-in-MastodonAPI-Responses.md",
+          "docs/Message-Rewrite-Facility-configuration.md",
+          "docs/Pleroma-API.md",
+          "docs/static_dir.md"
         ],
         main: "readme",
         output: "priv/static/doc"
@@ -55,9 +58,8 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      # Until Phoenix 1.4.1 is released
-      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
-      {:plug_cowboy, "~> 1.0"},
+      {:phoenix, "~> 1.4.1"},
+      {:plug_cowboy, "~> 2.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},
@@ -77,7 +79,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,