diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-11 22:31:48 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-11 22:31:48 +0000 |
commit | 33ea9b5ab750619bac0431e71e5d636ce463fe0c (patch) | |
tree | e918bc1917077531945dec03b0bc9381adfbe0ad /plugins/mod_disco.lua | |
parent | a075aed58388a229c8f842d491f938bb6027c9c8 (diff) | |
parent | 6aed6574671a2e5c33db67218df1887584f26c12 (diff) | |
download | prosody-33ea9b5ab750619bac0431e71e5d636ce463fe0c.tar.gz prosody-33ea9b5ab750619bac0431e71e5d636ce463fe0c.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions