diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:24:15 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-08-28 12:24:15 +0100 |
commit | d1f4af161d8dbd507ed3a91d194e4b77123a08f4 (patch) | |
tree | f9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /plugins/mod_disco.lua | |
parent | 580f0a2a97b67c80dcb77d386bf469912c5ddfcb (diff) | |
parent | f475cd36580a041206e9dc16a828bbc8586f6fbe (diff) | |
download | prosody-d1f4af161d8dbd507ed3a91d194e4b77123a08f4.tar.gz prosody-d1f4af161d8dbd507ed3a91d194e4b77123a08f4.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions