Merge branch 'develop' into issue/1383

2019-12-09 19:41:43 +03:00 · 2019-12-09 19:41:43 +03:00 · 2b821036c4
commit 2b821036c4
parent 5876a9cb79 0d2c13a119
37 changed files with 926 additions and 409 deletions
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -30,6 +30,7 @@ defmodule Pleroma.Application do
  # See http://elixir-lang.org/docs/stable/elixir/Application.html
  # for more information on OTP Applications
  def start(_type, _args) do
+    Pleroma.HTML.compile_scrubbers()
    Pleroma.Config.DeprecationWarnings.warn()
    setup_instrumenters()