Software / code / prosody
Diff
plugins/mod_server_contact_info.lua @ 8794:0e2c1c4d4f78
Merge 0.10 -> trunk
This commit intentionally drops changes from c2b99fa134b3
and 8da11142fabf which are based on older MUC code.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 16 May 2018 23:50:08 +0100 |
| parent | 8257:c24837f57259 |
| child | 9333:fd704adc62e1 |
