diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-13 01:30:24 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-13 01:30:24 +0200 |
commit | 9548228ec81cc66c0b58fa4b563029ea8cadb386 (patch) | |
tree | d35772be38d4db051d3631f2aeca80f0d0aa8ea1 /prosodyctl | |
parent | a22c6725be05e65b0ccde5b8e2b8eb22944a3426 (diff) | |
parent | caf3175a5f2b457c97bfe6ba217a2fcc0661baf2 (diff) | |
download | prosody-9548228ec81cc66c0b58fa4b563029ea8cadb386.tar.gz prosody-9548228ec81cc66c0b58fa4b563029ea8cadb386.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions