aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-29 14:58:42 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-29 14:58:42 +0100
commitf6c928c8a3d77a1f49e2e2ac0fa2ea74f6d5d170 (patch)
tree47793a1698f0b6d69fa8610ec0fc20b708e96442 /prosodyctl
parent83b016fe3d1298c6bd9994cd6e61833522459b26 (diff)
parent12541a3029c7f7aec3f01091a473f261c337f502 (diff)
downloadprosody-f6c928c8a3d77a1f49e2e2ac0fa2ea74f6d5d170.tar.gz
prosody-f6c928c8a3d77a1f49e2e2ac0fa2ea74f6d5d170.zip
Merge 0.10 -> trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions