diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-10 17:55:40 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-10 17:55:40 +0000 |
| commit | b201dabbfdf598f0d300bc9682444bd435611063 (patch) | |
| tree | 5e4b05f3526d7566cf3cba3b33e00db6d7d39038 /net | |
| parent | aa43aec46ef41d3bb5f398d10cb28aafa7502b5d (diff) | |
| parent | 74f4177db0d98a050df1693c5f3b061559865a64 (diff) | |
| download | prosody-b201dabbfdf598f0d300bc9682444bd435611063.tar.gz prosody-b201dabbfdf598f0d300bc9682444bd435611063.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/websocket/frames.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua index 737f46bb..5fe96d45 100644 --- a/net/websocket/frames.lua +++ b/net/websocket/frames.lua @@ -7,7 +7,6 @@ -- local softreq = require "util.dependencies".softreq; -local log = require "util.logger".init "websocket.frames"; local random_bytes = require "util.random".bytes; local bit = assert(softreq"bit" or softreq"bit32", |