diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-17 23:20:41 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-17 23:20:41 +0100 |
commit | fd894fe73e9890435a1c0ec97b660c888ac38e3b (patch) | |
tree | b62d53ea2041a4fa193e4b0c160fc308c8151b8a /prosodyctl | |
parent | beb642888ec3e3c27d96f6e4cf969033b8495d8e (diff) | |
parent | d494870913b1789d0313681ff74c0954a4bde3df (diff) | |
download | prosody-fd894fe73e9890435a1c0ec97b660c888ac38e3b.tar.gz prosody-fd894fe73e9890435a1c0ec97b660c888ac38e3b.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions