aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-10 17:55:40 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-10 17:55:40 +0000
commit96bfdd66ff021279115716c0640539e97739f51e (patch)
tree5e4b05f3526d7566cf3cba3b33e00db6d7d39038 /net
parent5ea1c295b302a15b2322fb0b103e0bab32d62643 (diff)
parent0d16907ff389fad3fd9135f1f84c4805b5e19687 (diff)
downloadprosody-96bfdd66ff021279115716c0640539e97739f51e.tar.gz
prosody-96bfdd66ff021279115716c0640539e97739f51e.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/websocket/frames.lua1
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",