diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-22 14:39:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-22 14:39:20 +0200 |
commit | 0ea8db94300bd49be5cd9528302f28609791858f (patch) | |
tree | 0fbacc0858c54c8c025c98235af9e0f9ce32bca6 /prosodyctl | |
parent | f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b (diff) | |
parent | 288422c9c30c40727577f896b55596b40e0120f6 (diff) | |
download | prosody-0ea8db94300bd49be5cd9528302f28609791858f.tar.gz prosody-0ea8db94300bd49be5cd9528302f28609791858f.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions