diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-10-23 18:24:55 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-10-23 18:24:55 +0100 |
| commit | 0fb99ab508f05c662336c8e7300d8b0da22b6168 (patch) | |
| tree | 0bd76e86298c91d5072dc8d90e4355c3c728e28d /net/server.lua | |
| parent | 790c28b5986657bb95d98574309535ff157f5162 (diff) | |
| parent | ce86d8badcc0f93ea14f71abad9161cee80ad823 (diff) | |
| download | prosody-0fb99ab508f05c662336c8e7300d8b0da22b6168.tar.gz prosody-0fb99ab508f05c662336c8e7300d8b0da22b6168.zip | |
Making the best attempt out of a bad merge from waqas
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index 1661ba00..40cc6dc8 100644 --- a/net/server.lua +++ b/net/server.lua @@ -827,5 +827,5 @@ return { stats = stats,
closeall = closeall,
addtimer = addtimer,
-
+ wraptlsclient = wraptlsclient,
}
|