# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1622107122 -7200
# Node ID 057ce005937e16347b5e062d48519dac4fb913c7
# Parent  8bea29d1f82d212b2245f1312db8133fee500bf0
core.modulemanager: Inherit mod_server_contact_info onto components #1270

diff -r 8bea29d1f82d -r 057ce005937e CHANGES
--- a/CHANGES	Fri Sep 11 18:34:36 2020 +0200
+++ b/CHANGES	Thu May 27 11:18:42 2021 +0200
@@ -22,6 +22,7 @@
 -   MUC: support for XEP-0421 occupant identifiers
 -   mod_http_file_share: File sharing via HTTP (XEP-0363)
 -   statistics scheduling can be done by plugin
+-   mod_server_contact_info now loaded on components if enabled
 
 0.11.0
 ======
diff -r 8bea29d1f82d -r 057ce005937e core/modulemanager.lua
--- a/core/modulemanager.lua	Fri Sep 11 18:34:36 2020 +0200
+++ b/core/modulemanager.lua	Thu May 27 11:18:42 2021 +0200
@@ -42,6 +42,7 @@
 	"iq",
 	"s2s",
 	"s2s_bidi",
+	"server_contact_info",
 };
 
 -- We need this to let modules access the real global namespace
diff -r 8bea29d1f82d -r 057ce005937e spec/scansion/prosody.cfg.lua
--- a/spec/scansion/prosody.cfg.lua	Fri Sep 11 18:34:36 2020 +0200
+++ b/spec/scansion/prosody.cfg.lua	Thu May 27 11:18:42 2021 +0200
@@ -127,7 +127,6 @@
 	admins = { "Admin@localhost" }
 	modules_enabled = {
 		"muc_mam";
-		"server_contact_info";
 	}