aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-03 23:49:15 +0200
committerKim Alvefur <zash@zash.se>2015-09-03 23:49:15 +0200
commit1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b (patch)
tree00d541185816de24e7a9b1c8e9fa773bd53f8b8f
parentd6e03dc82dfc3f5fa1787bda74195a994c113b79 (diff)
parentee7527ac00b9cf8f036b67066bbae060acc95629 (diff)
downloadprosody-1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b.tar.gz
prosody-1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b.zip
Merge 0.10->trunk
-rw-r--r--util/stanza.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index dc1600b0..90422a06 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -427,4 +427,5 @@ return {
reply = reply;
error_reply = error_reply;
presence = presence;
+ xml_escape = xml_escape;
};