diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-08-02 18:16:04 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-08-02 18:16:04 +0300 |
| commit | 9d4f34fbcb1a8e2eca424b3a3374c9f9af972574 (patch) | |
| tree | c5943eb5d2652e08cc12d0b58a992376c425e66d /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | d2da3d30f3349946500423bab53e0c1221ab7b9b (diff) | |
| parent | 5ff8f07ca906d77a6ec1d5ba912a787f855364f9 (diff) | |
| download | pleroma-9d4f34fbcb1a8e2eca424b3a3374c9f9af972574.tar.gz | |
Merge branch 'develop' into feature/digest-email
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) |