summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
commit212c31c63796a21233e8decf7ce46853383286fd (patch)
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad /mix.exs
parent64165d1df95bc3a22260dafa4584471427685864 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz
pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index dd598345c..890979f8b 100644
--- a/mix.exs
+++ b/mix.exs
@@ -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