aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_disco.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-08-05 17:21:19 +0100
committerMatthew Wild <mwild1@gmail.com>2012-08-05 17:21:19 +0100
commitf6edccc24c0ebf7b4ec86826d66259ba1cad8f0d (patch)
treee484cf5d1806a0a3932418e65e4e4e39a1413e2a /plugins/mod_disco.lua
parente1cf1cf3880e871b4d28c6dc18d97eefa0122f32 (diff)
parenta5b04b23ec4dbbe5674b0ab596427193877923d6 (diff)
downloadprosody-f6edccc24c0ebf7b4ec86826d66259ba1cad8f0d.tar.gz
prosody-f6edccc24c0ebf7b4ec86826d66259ba1cad8f0d.zip
Merge 0.9->trunk (who has been pushing to trunk?)
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions