Mercurial > prosody-modules
diff mod_server_contact_info/mod_server_contact_info.lua @ 1322:bf6796061037
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 26 Feb 2014 20:17:13 +0100 |
parents | 4fdcb5c35021 |
children | 465b34fdeb60 |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 26 Feb 2014 20:17:13 +0100 |
parents | 4fdcb5c35021 |
children | 465b34fdeb60 |