diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-22 15:24:20 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-22 15:24:20 +0100 |
commit | cccb4ab09be9573c02e0d2684e062363cd7eb068 (patch) | |
tree | 3bb6d5bb05f75122414728e4605bbdb9aacacae0 /util/prosodyctl.lua | |
parent | e13dc52b494737b8fa8e9c14ce68810782bee7aa (diff) | |
parent | 7ebc652e1dde5db4ba00782579a1948b912fa930 (diff) | |
download | prosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.tar.gz prosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions