aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-15 02:15:15 +0200
committerKim Alvefur <zash@zash.se>2017-04-15 02:15:15 +0200
commit80661f1de092db42eed2e0df4457fc242f412366 (patch)
treee6dd7deeca0d05f62cfa05c92fcd95af2bb83701 /prosodyctl
parentd6af211506ae087d30ee569e97b14ef0ca80fa74 (diff)
parentb176da9b89041c751f6b2b74e46571e2e86efe85 (diff)
downloadprosody-80661f1de092db42eed2e0df4457fc242f412366.tar.gz
prosody-80661f1de092db42eed2e0df4457fc242f412366.zip
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions