aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
committerKim Alvefur <zash@zash.se>2017-07-06 11:24:36 +0200
commitaca11d8afe0573dd1573356bd14edd4bb823a187 (patch)
treed54d6743becde2246fed6859f25ec6ee72e0d080 /util/import.lua
parentf99d0138bf2fc1eefcc8954e2a3d0ac41419ca85 (diff)
parentb5181287340558c4e97cd2a3b08b84840cd80c9a (diff)
downloadprosody-aca11d8afe0573dd1573356bd14edd4bb823a187.tar.gz
prosody-aca11d8afe0573dd1573356bd14edd4bb823a187.zip
Merge 0.10->trunk
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions