diff options
author | Kim Alvefur <zash@zash.se> | 2014-03-09 23:47:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-03-09 23:47:53 +0100 |
commit | 9ea9c5719a2275b3ae66378619cef64a392a1fec (patch) | |
tree | e200875dd171732b5fcd8da80a7b225b72c89491 /plugins/mod_disco.lua | |
parent | 42c4183e34f2a15920d3df042eed5531b552c495 (diff) | |
parent | f666a0d9340519bc839fa97f2f9d5e6e8cad9cdb (diff) | |
download | prosody-9ea9c5719a2275b3ae66378619cef64a392a1fec.tar.gz prosody-9ea9c5719a2275b3ae66378619cef64a392a1fec.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions