diff options
| author | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-02-04 01:08:27 +0100 |
| commit | 314ce335b9a3f23224237f829c9b166eeb345187 (patch) | |
| tree | 300927642fc0f857d9ea96ab4b1e2bc2d4c20950 /plugins/mod_mam/mod_mam.lua | |
| parent | c534c1414eec471209c54a917152593da3198c90 (diff) | |
| parent | 0f6de0b8f9c41090298ca0b3f998832971ff51b2 (diff) | |
| download | prosody-314ce335b9a3f23224237f829c9b166eeb345187.tar.gz prosody-314ce335b9a3f23224237f829c9b166eeb345187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mod_mam.lua')
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index f6ca52c0..44141409 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -15,7 +15,7 @@ local xmlns_forward = "urn:xmpp:forward:0"; local um = require "core.usermanager"; local st = require "util.stanza"; -local rsm = require "rsm"; +local rsm = require "util.rsm"; local get_prefs = module:require"mamprefs".get; local set_prefs = module:require"mamprefs".set; local prefs_to_stanza = module:require"mamprefsxml".tostanza; |