Mercurial > prosody-hg
diff plugins/mod_server_contact_info.lua @ 8369:e08a0ff6ce14
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 03 Nov 2017 01:17:53 +0100 |
| parents | c24837f57259 |
| children | fd704adc62e1 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 03 Nov 2017 01:17:53 +0100 |
| parents | c24837f57259 |
| children | fd704adc62e1 |