Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sat, 10 Mar 2018 20:49:52 +0100
changeset 8593 4b5a00fffb22
parent 8583 b23da88b3507 (current diff)
parent 8592 4e475ef4b569 (diff)
child 8594 0c322389f994
child 8705 7e7aa0f770c7
Merge 0.9->0.10
.hgtags
plugins/mod_admin_telnet.lua
plugins/muc/muc.lib.lua
--- a/.hgtags	Fri Mar 09 21:51:06 2018 +0100
+++ b/.hgtags	Sat Mar 10 20:49:52 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	Fri Mar 09 21:51:06 2018 +0100
+++ b/plugins/mod_admin_telnet.lua	Sat Mar 10 20:49:52 2018 +0100
@@ -1114,7 +1114,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("");