X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=mix.exs;h=33a8f11bbe3a26f862f4e950a492afb853086961;hb=287d92c9202de151c917550a5bfc5715d57dff83;hp=9bd807d8cfa1f6957326032efe42d05cec3f37dc;hpb=8ef4afcc3b44fae25d81b65b802967a85223e7dd;p=akkoma

diff --git a/mix.exs b/mix.exs
index 9bd807d8c..33a8f11bb 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("1.1.0"),
+      version: version("1.1.4"),
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -106,7 +106,7 @@ defmodule Pleroma.Mixfile do
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
       {:html_sanitize_ex, "~> 1.3.0"},
-      {:html_entities, "~> 0.4"},
+      {:html_entities, "~> 0.5", override: true},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
@@ -216,7 +216,7 @@ defmodule Pleroma.Mixfile do
            branch_name <- String.trim(branch_name),
            branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
            true <-
-             !Enum.all?(["master", "HEAD", "release/", "stable"], fn name ->
+             !Enum.any?(["master", "HEAD", "release/", "stable"], fn name ->
                String.starts_with?(name, branch_name)
              end) do
         branch_name =