diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
commit | 84bdb8e16589bdeb9e4fa4f501c25e73a1ce2452 (patch) | |
tree | 04a1c3f3af54f4b092c83cce4df035594f3b6ac1 /util/prosodyctl.lua | |
parent | eb231e9eab6b279246a50f3d0f2bcf6e3c5f529a (diff) | |
parent | 4afac948b9edc08d68b09f0dfe76be82a2cfb6f9 (diff) | |
download | prosody-84bdb8e16589bdeb9e4fa4f501c25e73a1ce2452.tar.gz prosody-84bdb8e16589bdeb9e4fa4f501c25e73a1ce2452.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions