projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/unwrapped-object-return' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index dcb9d9ea8ff10598ffbddbe4be2b1119575df29f..0a3a03a615a8772d31ac5c5fefd71fcc7a98c122 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-63,7
+63,7
@@
defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
def application do
[
mod: {Pleroma.Application, []},
- extra_applications: [:logger, :runtime_tools, :comeonin, :quack],
+ extra_applications: [:logger, :runtime_tools, :comeonin, :quack
, :myhtmlex, :swarm
],
included_applications: [:ex_syslogger]
]
end
included_applications: [:ex_syslogger]
]
end
@@
-108,8
+108,10
@@
defmodule Pleroma.Mixfile do
{:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.7"},
{:comeonin, "~> 4.1.1"},
{:pbkdf2_elixir, "~> 0.12.3"},
{:trailing_format_plug, "~> 0.0.7"},
- {:html_sanitize_ex, "~> 1.3.0"},
- {:html_entities, "~> 0.4"},
+ {:fast_sanitize,
+ git: "https://git.pleroma.social/pleroma/fast_sanitize.git",
+ ref: "1af67547a02a104e26c99d03012383e8643bc4c2"},
+ {:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},
{:phoenix_html, "~> 2.10"},
{:calendar, "~> 0.17.4"},
{:cachex, "~> 3.0.2"},