diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-14 01:47:19 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-14 01:47:19 +0100 |
commit | 91d5ac9714bfd90120cbb3ce3bf1f378be0dd75c (patch) | |
tree | 7d28b4edd259140fcdf70663b3a4bf06f5a6c7f2 /prosodyctl | |
parent | 10a290e111c447b2062e103397058ce6ca8c7cfc (diff) | |
parent | 6e0fc36aff25f393c4f338f8c66dfd300b109e6f (diff) | |
download | prosody-91d5ac9714bfd90120cbb3ce3bf1f378be0dd75c.tar.gz prosody-91d5ac9714bfd90120cbb3ce3bf1f378be0dd75c.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions