# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1697374644 -7200
# Node ID 081f8f9b3b8191b40f5df314bee23b75e1037d0f
# Parent  9c62ffbdf2aebb9bb09cd35c2585f29572ddcec9# Parent  7ae000fc8c0729ba218cc6a41d7c8d2a7ed10649
Merge 0.12->trunk

diff -r 9c62ffbdf2ae -r 081f8f9b3b81 .hgtags
--- 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
diff -r 9c62ffbdf2ae -r 081f8f9b3b81 plugins/mod_muc_mam.lua
--- 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),
 		}
 		);