# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1613424628 -3600
# Node ID b790df8f94486ae4d6e8a23a7e3c9966b5695b20
# Parent  6b687210975b83c4821dbedc4d652355d9d59333# Parent  ab334ddc61528ad0a2d30d9eedf79b79c7e64030
Merge 0.11->trunk

diff -r 6b687210975b -r b790df8f9448 .hgtags
--- 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
diff -r 6b687210975b -r b790df8f9448 plugins/mod_pep.lua
--- 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