diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-14 18:27:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-14 18:27:32 +0100 |
commit | 6cac5f4cc2ba5697e556b6ffd4c2506ff94ddb39 (patch) | |
tree | 716fb68621be4bcfe9fdb1a11637c9ba21b29f6f | |
parent | ef3eaa5cc59ab7ec848e19fb95ffba8ef585f6d2 (diff) | |
parent | e93392fd66f97630c660d071c6a76fed845f6f62 (diff) | |
download | prosody-6cac5f4cc2ba5697e556b6ffd4c2506ff94ddb39.tar.gz prosody-6cac5f4cc2ba5697e556b6ffd4c2506ff94ddb39.zip |
Merge 0.10->trunk
-rw-r--r-- | plugins/mod_presence.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 4ac017ba..64d5a47b 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -27,7 +27,7 @@ local NULL = {}; local rostermanager = require "core.rostermanager"; local sessionmanager = require "core.sessionmanager"; -local recalc_resource_map = require "util.presencepriority".recalc_resource_map; +local recalc_resource_map = require "util.presence".recalc_resource_map; local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false); |