Mercurial > prosody-modules
diff mod_server_contact_info/mod_server_contact_info.lua @ 931:e20e94d75fe3
Merge (someone needs to remember to pull...)
author | Marco Cirillo <maranda@lightwitch.org> |
---|---|
date | Tue, 12 Mar 2013 19:09:26 +0100 |
parents | 074237d7820b |
children | 4fdcb5c35021 |