diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-21 22:56:39 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-21 22:56:39 +0200 |
commit | 20b57f7f016e907cf3d89793f5c57aaeff0b630f (patch) | |
tree | 2439c11f443bb165c42003bfb5bf7bcbf91924fb /util/prosodyctl.lua | |
parent | 022944ecc4e5d4d8ece338f05eb8fe4366c11155 (diff) | |
parent | f4b4f1020ae91754d915d296749510031e7c784c (diff) | |
download | prosody-20b57f7f016e907cf3d89793f5c57aaeff0b630f.tar.gz prosody-20b57f7f016e907cf3d89793f5c57aaeff0b630f.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions