# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1604611885 -3600
# Node ID bf8f2da840070886e16461a571ed12ee261a3e82
# Parent  6c7c50a4de32d2976b5070e6845532913323b513# Parent  c4c06fbb7d87809eed2741aad723c5ac56427e18
Merge 0.11->trunk

diff -r c4c06fbb7d87 -r bf8f2da84007 net/http/files.lua
diff -r c4c06fbb7d87 -r bf8f2da84007 plugins/mod_pubsub/mod_pubsub.lua
--- a/plugins/mod_pubsub/mod_pubsub.lua	Fri Oct 30 14:05:07 2020 +0000
+++ b/plugins/mod_pubsub/mod_pubsub.lua	Thu Nov 05 22:31:25 2020 +0100
@@ -128,7 +128,7 @@
 		end
 	end
 	return summary;
-end);
+end, -1);
 
 module:hook("iq/host/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
 module:hook("iq/host/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
diff -r c4c06fbb7d87 -r bf8f2da84007 plugins/mod_s2s.lua