Mercurial > prosody-modules
diff mod_server_contact_info/mod_server_contact_info.lua @ 1012:c53a1b8a1cfa
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | 4fdcb5c35021 |
| children | 465b34fdeb60 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 May 2013 16:27:05 +0100 |
| parents | 4fdcb5c35021 |
| children | 465b34fdeb60 |