diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:32:46 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:32:46 +0100 |
commit | 38a7865229c7049bcbfa3e7f78016bf5e988ca28 (patch) | |
tree | a0564ac0d43d718d122652133cc4c3a5453f8995 /plugins/mod_disco.lua | |
parent | d0b87d8ac6edb12b2eb1b0550fe4e273e8720446 (diff) | |
parent | f3aaf833ca073cef76d781a3d27108e27160271e (diff) | |
download | prosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.tar.gz prosody-38a7865229c7049bcbfa3e7f78016bf5e988ca28.zip |
Merge with backout
Diffstat (limited to 'plugins/mod_disco.lua')
0 files changed, 0 insertions, 0 deletions