diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
| commit | c88a5d32514f4ed78e4b9216198db62e8799ffe4 (patch) | |
| tree | bc979f2522156be74138491114892e7acbeaafcb /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 41e0304757c5a0d9778f7e685c9ddf481f0e15cb (diff) | |
| parent | 66575061851f13355958fd292ee545462bf191c0 (diff) | |
| download | pleroma-c88a5d32514f4ed78e4b9216198db62e8799ffe4.tar.gz | |
Merge branch 'develop' into feature/hide-follows-remote
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index a1d7fcc7d..54f89e65c 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -165,6 +165,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do }, accountActivationRequired: Config.get([:instance, :account_activation_required], false), invitesEnabled: Config.get([:instance, :invites_enabled], false), + mailerEnabled: Config.get([Pleroma.Emails.Mailer, :enabled], false), features: features, restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]), skipThreadContainment: Config.get([:instance, :skip_thread_containment], false) |