prosody
cb0dd442ca63
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server.lua @ 138:cb0dd442ca63

Making the best attempt out of a bad merge from waqas
author Matthew Wild <mwild1@gmail.com>
date Thu, 23 Oct 2008 18:24:55 +0100
parent 127:93f3c6b94c75
child 319:4a8a949c3870
line wrap: on
line diff
--- a/net/server.lua	Thu Oct 23 22:08:19 2008 +0500
+++ b/net/server.lua	Thu Oct 23 18:24:55 2008 +0100
@@ -827,5 +827,5 @@
 	stats = stats,
 	closeall = closeall,
 	addtimer = addtimer,
-
+	wraptlsclient = wraptlsclient,
 }