diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-11 15:33:18 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-11 15:33:18 +0100 |
commit | b8729825eedb4515da4df2d37f7bce5e21518442 (patch) | |
tree | 9021ac71e1747dce473019f7dc14803d4fa4751a /util/prosodyctl.lua | |
parent | 596cd6813cca26de9864a92650b04aa90d4af3c3 (diff) | |
parent | 6490acf700c4d8c197320dfe0602462ed0d4d212 (diff) | |
download | prosody-b8729825eedb4515da4df2d37f7bce5e21518442.tar.gz prosody-b8729825eedb4515da4df2d37f7bce5e21518442.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions