summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-05-10 09:17:16 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-05-10 09:17:16 +0300
commitb0d0d8f91b242a2975a755f0ddeaec9f016d2d18 (patch)
tree681048f2df992934a80ca5e5ad10c3ad17474a66 /mix.exs
parentaee88d11be898921d79ad7f1481ab055190f4dfd (diff)
parentb3e6953d23250393010adb01fc604f97fd17eb96 (diff)
downloadpleroma-b0d0d8f91b242a2975a755f0ddeaec9f016d2d18.tar.gz
pleroma-b0d0d8f91b242a2975a755f0ddeaec9f016d2d18.zip
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs10
1 files changed, 9 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 6d65e18d4..97b561790 100644
--- a/mix.exs
+++ b/mix.exs
@@ -72,7 +72,15 @@ defmodule Pleroma.Mixfile do
def application do
[
mod: {Pleroma.Application, []},
- extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :ssl],
+ extra_applications: [
+ :logger,
+ :runtime_tools,
+ :comeonin,
+ :quack,
+ :fast_sanitize,
+ :ssl,
+ :eldap
+ ],
included_applications: [:ex_syslogger]
]
end