diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-03 23:55:46 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-03 23:55:46 +0100 |
commit | a6a85dc46679f0b252e1937233e1e8828f0addbc (patch) | |
tree | f47d17c24401b155816ceebfd33c898cb54b749b /util/prosodyctl.lua | |
parent | 1a12e55904adf8bbb5ca0663d5720f3862de3413 (diff) | |
parent | f8b911269b90918b014319cbdda32eedc687d941 (diff) | |
download | prosody-a6a85dc46679f0b252e1937233e1e8828f0addbc.tar.gz prosody-a6a85dc46679f0b252e1937233e1e8828f0addbc.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/prosodyctl.lua')
0 files changed, 0 insertions, 0 deletions