1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00

Merge branch 'master' into socketdev

This commit is contained in:
Kane York 2015-10-27 18:26:28 -07:00
commit 2fd1817627
30 changed files with 898 additions and 139 deletions

View file

@ -36,6 +36,9 @@ FFZ.prototype.ws_iframe = function() {
FFZ.prototype.ws_create = function() {
// Disable sockets for now.
return;
var f = this, ws;
this._ws_last_req = 0;