diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-13 18:30:18 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-13 18:30:18 +0100 |
commit | 26f2953106794bbdd23db98f69fb6e90a4b8e460 (patch) | |
tree | 5dfa49570563bb3738e7038af9b419106296a627 /util/prosodyctl.lua | |
parent | c3d9a2c11d362fcd1677d169af395c1f7bb8d4f1 (diff) | |
parent | 4d644d2c03246c3dcb2937475965e7f849a053b4 (diff) | |
download | prosody-26f2953106794bbdd23db98f69fb6e90a4b8e460.tar.gz prosody-26f2953106794bbdd23db98f69fb6e90a4b8e460.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions