aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-11 21:29:24 +0200
committerKim Alvefur <zash@zash.se>2020-05-11 21:29:24 +0200
commit1d34aa9296c22ac0e4dbcb2f352d38130d6a78f4 (patch)
treeb0f8769400f74deac5d6a36c26c99826c400becf
parente856c00107938f0442342e3550baae4bab3f3901 (diff)
parent031e272a9c77eb9b27e95e164558f917b21d74d6 (diff)
downloadprosody-1d34aa9296c22ac0e4dbcb2f352d38130d6a78f4.tar.gz
prosody-1d34aa9296c22ac0e4dbcb2f352d38130d6a78f4.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_muc_mam.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua
index f22f20f2..4bc43ec3 100644
--- a/plugins/mod_muc_mam.lua
+++ b/plugins/mod_muc_mam.lua
@@ -351,7 +351,7 @@ module:hook("muc-broadcast-message", function (event)
return tag;
end);
-end, 0);
+end, 1);
-- Handle messages
local function save_to_history(self, stanza)