aboutsummaryrefslogtreecommitdiffstats
path: root/util/import.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-18 15:00:17 +0100
committerKim Alvefur <zash@zash.se>2016-02-18 15:00:17 +0100
commit90252e8dcc284a3213ae738052c6b6d95628eea7 (patch)
tree41f67d3fa5580f3a6b3421303d78a6c68a5e2ff1 /util/import.lua
parentf0979385d306fc2c20ba995b29e7b4e0e43f6c15 (diff)
parentcecd6ca31df847722dc98eb88d374bc58f3020c8 (diff)
downloadprosody-90252e8dcc284a3213ae738052c6b6d95628eea7.tar.gz
prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.zip
Merge 0.10->trunk
Diffstat (limited to 'util/import.lua')
0 files changed, 0 insertions, 0 deletions