Merge 0.12->trunk
authorKim Alvefur <zash@zash.se>
Sun, 15 Oct 2023 14:57:24 +0200
changeset 13272 081f8f9b3b81
parent 13270 9c62ffbdf2ae (current diff)
parent 13271 7ae000fc8c07 (diff)
child 13273 d50bee584969
Merge 0.12->trunk
plugins/mod_muc_mam.lua
--- a/.hgtags	Sat Oct 14 22:43:39 2023 +0200
+++ b/.hgtags	Sun Oct 15 14:57:24 2023 +0200
@@ -86,3 +86,4 @@
 be09ac8300a7bde4e81f7cc4e4ee5b0745ab14b7 0.11.14
 3784a8ce05961ddc0f0374f8c12618d9a411546b 0.12.2
 0598d822614f6637a5baaec78570db025c76f722 0.12.3
+a2ba3f06dcf44b713b65355351653826cccea59c 0.12.4
--- a/plugins/mod_muc_mam.lua	Sat Oct 14 22:43:39 2023 +0200
+++ b/plugins/mod_muc_mam.lua	Sun Oct 15 14:57:24 2023 +0200
@@ -90,7 +90,7 @@
 		{
 			name = muc_form_enable,
 			type = "boolean",
-			label = "Enable archiving?",
+			label = "Archive chat on server",
 			value = archiving_enabled(room),
 		}
 		);