aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
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 /util/import.lua
parentde0076f16c510ebbfaedf17884e6248b42b599ca (diff)
parent1fc7b4fca0cdbf91c32f22136dd31b93c36204bb (diff)
downloadprosody-713017eff1e8314fe4eb81c3d456927c5963dcf0.tar.gz
prosody-713017eff1e8314fe4eb81c3d456927c5963dcf0.zip
Merge 0.10->trunk
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions