Mercurial > prosody-hg
comparison plugins/mod_server_contact_info.lua @ 11200:bf8f2da84007
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 05 Nov 2020 22:31:25 +0100 |
| parents | 6b27cb706b89 |
| children | 4ee7a6a8753e |
comparison
equal
deleted
inserted
replaced
| 11199:6c7c50a4de32 | 11200:bf8f2da84007 |
|---|---|
| 14 { name = "abuse", var = "abuse-addresses", type = "list-multi" }, | 14 { name = "abuse", var = "abuse-addresses", type = "list-multi" }, |
| 15 { name = "admin", var = "admin-addresses", type = "list-multi" }, | 15 { name = "admin", var = "admin-addresses", type = "list-multi" }, |
| 16 { name = "feedback", var = "feedback-addresses", type = "list-multi" }, | 16 { name = "feedback", var = "feedback-addresses", type = "list-multi" }, |
| 17 { name = "sales", var = "sales-addresses", type = "list-multi" }, | 17 { name = "sales", var = "sales-addresses", type = "list-multi" }, |
| 18 { name = "security", var = "security-addresses", type = "list-multi" }, | 18 { name = "security", var = "security-addresses", type = "list-multi" }, |
| 19 { name = "status", var = "status-addresses", type = "list-multi" }, | |
| 19 { name = "support", var = "support-addresses", type = "list-multi" }, | 20 { name = "support", var = "support-addresses", type = "list-multi" }, |
| 20 }); | 21 }); |
| 21 | 22 |
| 22 -- JIDs of configured service admins are used as fallback | 23 -- JIDs of configured service admins are used as fallback |
| 23 local admins = module:get_option_inherited_set("admins", {}); | 24 local admins = module:get_option_inherited_set("admins", {}); |
