diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-20 13:28:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-20 13:28:36 +0000 |
| commit | 2e2030ada8b9aa00936057d47260cd03d01d92be (patch) | |
| tree | 9fb353e3eaccb1dbd82738cf44ae5015100f6711 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 8de3138de07c0447ea3bc015ff71db25f8f9c931 (diff) | |
| parent | 851db74f1ca533f27f72f1341571948b15d2f561 (diff) | |
| download | pleroma-2e2030ada8b9aa00936057d47260cd03d01d92be.tar.gz | |
Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation
See merge request pleroma/pleroma!546
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 44c11f40a..70921605d 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -132,6 +132,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do banner: Keyword.get(instance, :banner_upload_limit), background: Keyword.get(instance, :background_upload_limit) }, + accountActivationRequired: Keyword.get(instance, :account_activation_required, false), invitesEnabled: Keyword.get(instance, :invites_enabled, false), features: features } |