Mercurial > prosody-modules
diff mod_server_contact_info/mod_server_contact_info.lua @ 927:a9dfa7232d88
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 074237d7820b |
| children | 4fdcb5c35021 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 12 Mar 2013 12:10:25 +0000 |
| parents | 074237d7820b |
| children | 4fdcb5c35021 |