diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-09 13:32:11 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-09 13:32:11 +0000 |
| commit | 182aee9fe865dde5d7271deaa3245f651918d57e (patch) | |
| tree | 34e5a2a065d78ad0a3dbad2bddacd2dad579ae92 /mix.exs | |
| parent | 21716aa594064d5f4f4a91a8b40a679775709e1d (diff) | |
| parent | 287d92c9202de151c917550a5bfc5715d57dff83 (diff) | |
| download | pleroma-182aee9fe865dde5d7271deaa3245f651918d57e.tar.gz pleroma-182aee9fe865dde5d7271deaa3245f651918d57e.zip | |
Merge branch 'release/1.1.5' into 'stable'
Release/1.1.5
See merge request pleroma/pleroma!1954
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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"}, |
