diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
commit | f4c6b4507a503b3086942893f1222e7c5b50c4fa (patch) | |
tree | 3bba5532ac1efa1c38656bc97d43cda718604029 /plugins/mod_disco.lua | |
parent | 8dc3c63849f1d6bccb305f01fbc21ead6b42f327 (diff) | |
parent | 3429c471cfff6815c0bdb579b850b5ad6476bbee (diff) | |
download | prosody-f4c6b4507a503b3086942893f1222e7c5b50c4fa.tar.gz prosody-f4c6b4507a503b3086942893f1222e7c5b50c4fa.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions