Software / code / prosody
Changeset
8591:0c322389f994
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 10 Mar 2018 20:52:14 +0100 |
| parents | 8586:c3b87a37c100 (current diff) 8590:4b5a00fffb22 (diff) |
| children | 8592:bd4f8a2b72c7 |
| files | plugins/mod_admin_telnet.lua plugins/muc/muc.lib.lua |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Mar 10 02:28:29 2018 +0100 +++ b/.hgtags Sat Mar 10 20:52:14 2018 +0100 @@ -61,3 +61,4 @@ 8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11 2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 0.9.12 39966cbc29f46d7ae9660edca8683d5121c82edf 0.10.0 +082d127286451eb55420c36424dd321e8d9bceee 0.9.13
--- a/plugins/mod_admin_telnet.lua Sat Mar 10 02:28:29 2018 +0100 +++ b/plugins/mod_admin_telnet.lua Sat Mar 10 20:52:14 2018 +0100 @@ -1151,7 +1151,7 @@ local http_host = module:context(host):get_option_string("http_host"); print("HTTP endpoints on "..host..(http_host and (" (using "..http_host.."):") or ":")); for _, provider in ipairs(http_apps) do - local url = module:context(host):http_url(provider.name); + local url = module:context(host):http_url(provider.name, provider.default_path); print("", url); end print("");
