aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_disco.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-31 19:09:34 +0100
committerKim Alvefur <zash@zash.se>2013-12-31 19:09:34 +0100
commit667f75150d48db1815d8566228a41e9290fe163e (patch)
tree1bd9bf4c41dcfba42c26fece5df37138185b774f /plugins/mod_disco.lua
parent195743afe083f3b66a4fa2cd594e75f150e81968 (diff)
parentc9a6cd1b3365ffb0676f542cc81ddecd4b46dbd0 (diff)
downloadprosody-667f75150d48db1815d8566228a41e9290fe163e.tar.gz
prosody-667f75150d48db1815d8566228a41e9290fe163e.zip
Merge 0.10->trunk and Happy New Year!
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions