Merge branch 'develop' into gun

This commit is contained in:
Alexander Strizhakov 2020-03-30 12:15:23 +03:00
commit f497cf2f7c
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
43 changed files with 1529 additions and 318 deletions

View file

@ -63,7 +63,7 @@ defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize],
extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :ssl],
included_applications: [:ex_syslogger]
]
end