prosody
081f8f9b3b81

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

13268:081f8f9b3b81

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 15 Oct 2023 14:57:24 +0200
parents 13266:9c62ffbdf2ae (current diff) 13267:7ae000fc8c07 (diff)
children 13269:d50bee584969
files plugins/mod_muc_mam.lua
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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),
 		}
 		);