Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Mon, 15 Feb 2021 22:30:28 +0100
changeset 11382 b790df8f9448
parent 11379 6b687210975b (current diff)
parent 11381 ab334ddc6152 (diff)
child 11383 5c820553ef82
Merge 0.11->trunk
plugins/mod_pep.lua
--- a/.hgtags	Sat Feb 13 14:14:12 2021 +0100
+++ b/.hgtags	Mon Feb 15 22:30:28 2021 +0100
@@ -75,3 +75,4 @@
 bacca65ce107b8549ce5f9079e81e5771eed2021 0.11.6
 0000000000000000000000000000000000000000 0.11.7
 ece430d4980997b216c2240015bf922bdeb12dd6 0.11.7
+774811e2c6abfc5a1b1dd60007cf564bb7c1f969 0.11.8
--- a/plugins/mod_pep.lua	Sat Feb 13 14:14:12 2021 +0100
+++ b/plugins/mod_pep.lua	Mon Feb 15 22:30:28 2021 +0100
@@ -422,6 +422,7 @@
 		"presence-subscribe",
 	};
 
+	reply:tag('feature', {var=xmlns_pubsub}):up();
 	for feature in supported_features do
 		reply:tag('feature', {var=xmlns_pubsub.."#"..feature}):up();
 	end