aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-05-24 15:35:28 +0200
committerKim Alvefur <zash@zash.se>2023-05-24 15:35:28 +0200
commitdd2e84271facb85d6cc079094917cbe0feff7225 (patch)
tree06e894e658676d3c816acbbfa6fdc9c287388b0a /core
parent3320521129c7c335c44f98eac129c1cf3b3d5210 (diff)
parent20afe7d20dfde84a9deb6ed4f85a6e7a9429f09c (diff)
downloadprosody-dd2e84271facb85d6cc079094917cbe0feff7225.tar.gz
prosody-dd2e84271facb85d6cc079094917cbe0feff7225.zip
Merge 0.12->trunk
Diffstat (limited to 'core')
-rw-r--r--core/features.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/features.lua b/core/features.lua
index 9acc2042..8fbfbe9c 100644
--- a/core/features.lua
+++ b/core/features.lua
@@ -10,5 +10,7 @@ return {
"loader";
-- "keyval+" store
"keyval+";
+
+ "s2sout-pre-connect-event";
};
};