diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-02-18 13:49:19 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-02-18 13:49:19 +0000 |
commit | b899f5bc37229064d4995ecedde6b8b329db9e3f (patch) | |
tree | bc070a843a55e064508fe8efd43fd563bcf9247c /plugins/mod_disco.lua | |
parent | 7e0b29e4e26c0c1f0403f79e85bbb377035502bf (diff) | |
parent | 68d19b7be1bb696a565539a87d1149fd5de0bd20 (diff) | |
download | prosody-b899f5bc37229064d4995ecedde6b8b329db9e3f.tar.gz prosody-b899f5bc37229064d4995ecedde6b8b329db9e3f.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions