diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-09-02 18:55:35 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-09-02 18:55:35 +0100 |
| commit | ee2c04d00330a6ac76b6360d2d06b02bcc001546 (patch) | |
| tree | 75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /prosody | |
| parent | 0944fb2e1b3c6b10fef40e93e0ba0ae72795acac (diff) | |
| parent | 63f8291d160b050741e804e5a58e392381555e14 (diff) | |
| download | prosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.tar.gz prosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -121,6 +121,7 @@ end function load_libraries() -- Load socket framework + socket = require "socket"; server = require "net.server" end |