# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1601124308 -7200
# Node ID a2d5834d4a9e96749775cfe95872667466b24dca
# Parent  4ee2a90d38183f32b048357afb2792d862a1f78e# Parent  87daef9ed4e7213cf89b58046a4cd1d91adbdb18
Merge

diff -r 87daef9ed4e7 -r a2d5834d4a9e mod_cloud_notify/mod_cloud_notify.lua
--- a/mod_cloud_notify/mod_cloud_notify.lua	Mon Sep 21 21:57:25 2020 +0200
+++ b/mod_cloud_notify/mod_cloud_notify.lua	Sat Sep 26 14:45:08 2020 +0200
@@ -257,7 +257,7 @@
 		local stanza_direction = "in";
 		local carbon;
 		local st_type;
-		-- support carbon copied message stanzas having an arbitrary message-namespace or no message-namespace at all
+		-- support carbon copied message stanzas
 		if not carbon then carbon = stanza:find("{urn:xmpp:carbons:2}/{urn:xmpp:forward:0}/{jabber:client}message"); end
 		stanza_direction = carbon and stanza:child_with_name("sent") and "out" or "in";
 		if carbon then stanza = carbon; end
diff -r 87daef9ed4e7 -r a2d5834d4a9e mod_conversejs/mod_conversejs.lua
--- a/mod_conversejs/mod_conversejs.lua	Mon Sep 21 21:57:25 2020 +0200
+++ b/mod_conversejs/mod_conversejs.lua	Sat Sep 26 14:45:08 2020 +0200
@@ -92,6 +92,7 @@
 		domain_placeholder = module.host;
 		allow_registration = allow_registration;
 		registration_domain = allow_registration and module.host or nil;
+		assets_path = cdn_url..version.."/dist/";
 		view_mode = "fullscreen";
 	};
 
diff -r 87daef9ed4e7 -r a2d5834d4a9e mod_easy_invite/README.markdown
--- a/mod_easy_invite/README.markdown	Mon Sep 21 21:57:25 2020 +0200
+++ b/mod_easy_invite/README.markdown	Sat Sep 26 14:45:08 2020 +0200
@@ -7,8 +7,10 @@
   - mod_invites
 ---
 
+::: {.alert .alert-warning}
 **NOTE:** This module has been deprecated. Its functionality has been
 moved to other modules, see the mod_invites documentation for details.
+:::
 
 
 This module allows admins and users to create invitations suitable for sharing