diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-07-06 10:17:06 +0300 |
| commit | ad8d86e7c600bca65e5f0bb407651d33f1e53043 (patch) | |
| tree | 75c395c888a10bad571769eaf828d989c2a5b2c4 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | a7994185739522dee80e22f76e5fdac1a3b8279b (diff) | |
| parent | 3589b30ddc9d0c23ca6f00264cff05e53be1b270 (diff) | |
| download | pleroma-ad8d86e7c600bca65e5f0bb407651d33f1e53043.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 32be430b7..869dda5c5 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -162,7 +162,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do accountActivationRequired: Config.get([:instance, :account_activation_required], false), invitesEnabled: Config.get([:instance, :invites_enabled], false), features: features, - restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]) + restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]), + skipThreadContainment: Config.get([:instance, :skip_thread_containment], false) } } end |