diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-19 22:49:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-19 22:49:36 +0200 |
commit | 8295fbe9dd1f303b78eea697d8c60b64d39e2788 (patch) | |
tree | 13796311a587eff27c57e9c7bbdb6fa1602096be /prosodyctl | |
parent | c41b7e9f46cbe2f8f2b251f825dcfebf86d17cf9 (diff) | |
parent | 8370703ece4eef92aa1b96cc39f4886ae2af01ac (diff) | |
download | prosody-8295fbe9dd1f303b78eea697d8c60b64d39e2788.tar.gz prosody-8295fbe9dd1f303b78eea697d8c60b64d39e2788.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions