diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-22 15:03:02 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-22 15:03:02 +0100 |
commit | e02f10f2e89143ed0355996deb52df4ed2d2efde (patch) | |
tree | 6826436cb243da87ede7abff06607216fa25fa4b /man/prosodyctl.markdown | |
parent | 7d92cd0c7909499c9e2bf2d179989518fd4133dd (diff) | |
parent | 9cfa6a9d4994b61842b2478df4470922fb3a2546 (diff) | |
download | prosody-e02f10f2e89143ed0355996deb52df4ed2d2efde.tar.gz prosody-e02f10f2e89143ed0355996deb52df4ed2d2efde.zip |
Merge 0.10->trunk
Diffstat (limited to 'man/prosodyctl.markdown')
0 files changed, 0 insertions, 0 deletions