aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-14 18:27:32 +0100
committerKim Alvefur <zash@zash.se>2016-03-14 18:27:32 +0100
commit713017eff1e8314fe4eb81c3d456927c5963dcf0 (patch)
tree716fb68621be4bcfe9fdb1a11637c9ba21b29f6f
parentde0076f16c510ebbfaedf17884e6248b42b599ca (diff)
parent1fc7b4fca0cdbf91c32f22136dd31b93c36204bb (diff)
downloadprosody-713017eff1e8314fe4eb81c3d456927c5963dcf0.tar.gz
prosody-713017eff1e8314fe4eb81c3d456927c5963dcf0.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_presence.lua2
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);