diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
commit | beb642888ec3e3c27d96f6e4cf969033b8495d8e (patch) | |
tree | ead046279a47ea5984c334f0c6500d85f5970dc8 /prosodyctl | |
parent | 02a841a72eb0e02a1f5091d0a23e10bf78ee368c (diff) | |
parent | 500d7efbf490f85cb88449f6e28bc8b4162bea14 (diff) | |
download | prosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.tar.gz prosody-beb642888ec3e3c27d96f6e4cf969033b8495d8e.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions