diff plugins/mod_presence.lua @ 7282:29eedc776bbd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 14 Mar 2016 18:27:32 +0100
parents 21da137d83b0
children c8ad387aab1c
line wrap: on
line diff
--- a/plugins/mod_presence.lua	Mon Mar 14 17:38:50 2016 +0100
+++ b/plugins/mod_presence.lua	Mon Mar 14 18:27:32 2016 +0100
@@ -27,7 +27,7 @@
 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);