hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

Browse source 
# Conflicts:
#	config/config.exs
#	mix.lock
This commit is contained in:
Ivan Tashkinov 2020-08-11 15:13:29 +03:00
commit 2def3cbf41
66 changed files with 1254 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mix.exs
View file

@ -127,7 +127,7 @@ defmodule Pleroma.Mixfile do
{:pbkdf2_elixir, "~> 1.2"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
{:fast_sanitize, "~> 0.1"},
{:fast_sanitize, "~> 0.2.0"},
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.14"},
{:calendar, "~> 1.0"},