diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-29 20:11:53 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-29 20:11:53 +0000 |
commit | e54b3961955e5491d6ac4e987a7f98de9cd0e171 (patch) | |
tree | 626dd6df98cae5d119fea0852d5fce67b6f73b89 /plugins/mod_disco.lua | |
parent | 1d911dd1d1983c0a2fc604f99f26e76a19b361db (diff) | |
parent | a075aed58388a229c8f842d491f938bb6027c9c8 (diff) | |
download | prosody-e54b3961955e5491d6ac4e987a7f98de9cd0e171.tar.gz prosody-e54b3961955e5491d6ac4e987a7f98de9cd0e171.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions