# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1542059490 -3600
# Node ID 4d758f575591ed60b6abe30633ca60878813aef5
# Parent  f85e12d9eedeb95139f0832be91f8acea910e4c3# Parent  269c6df1f0fbb40f76dcf694efb2efce80fa9638
Merge 0.11->trunk

diff -r f85e12d9eede -r 4d758f575591 spec/scansion/prosody.cfg.lua
--- a/spec/scansion/prosody.cfg.lua	Mon Nov 12 18:26:39 2018 +0100
+++ b/spec/scansion/prosody.cfg.lua	Mon Nov 12 22:51:30 2018 +0100
@@ -42,7 +42,9 @@
 		--"motd"; -- Send a message to users when they log in
 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
-		--"scansion_record";
+
+	-- Useful for testing
+		--"scansion_record"; -- Records things that happen in scansion test case format
 }
 
 certificate = "certs"