diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:15:36 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-11-21 02:15:36 +0000 |
commit | b97004e26e179b6a75ddd99fe2b817ce12badfe9 (patch) | |
tree | 409866ae1508da411182f14f5db3a5e7f731c60c /plugins/mod_disco.lua | |
parent | 1712a45fdc3fb3da014ad85e97eb7c7dab855e9a (diff) | |
parent | cb77e4d2580284e28a6c4562b613e5c9904a120e (diff) | |
download | prosody-b97004e26e179b6a75ddd99fe2b817ce12badfe9.tar.gz prosody-b97004e26e179b6a75ddd99fe2b817ce12badfe9.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions