diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-08 17:54:50 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-08 17:54:50 +0200 |
commit | c1c07f95ce0ae017932036e0dd87d6191fc15e3b (patch) | |
tree | 8cabfe532140fe1b4028c9e6a15c0f700f3e900c /prosodyctl | |
parent | 9dea8d532de0cb8dd6927554d3b347d8c62f2131 (diff) | |
parent | f009c36365c7db3d8a298b3e00d4fd850b010e9a (diff) | |
download | prosody-c1c07f95ce0ae017932036e0dd87d6191fc15e3b.tar.gz prosody-c1c07f95ce0ae017932036e0dd87d6191fc15e3b.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions