diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-23 23:22:13 +0200 |
commit | 36cd6e26bd72d1e494c6de5a836568edfd3eda78 (patch) | |
tree | 5575c703c5075d720211a69c699a333d03d00064 /plugins/mod_disco.lua | |
parent | 65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e (diff) | |
parent | 6aec6e84256f5411131b740ca16f31f065961fce (diff) | |
download | prosody-36cd6e26bd72d1e494c6de5a836568edfd3eda78.tar.gz prosody-36cd6e26bd72d1e494c6de5a836568edfd3eda78.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions