Merge branch '3.0' into streamable-1

This commit is contained in:
calzoneman 2016-08-07 21:27:27 -07:00
commit ac94d6ba22
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,10 @@
if (/^v0/.test(process.version)) {
console.error('node.js ' + process.version + ' is not supported. ' +
'For more information, visit ' +
'https://github.com/calzoneman/sync/wiki/CyTube-3.0-Installation-Guide#nodejs');
process.exit(1);
}
try {
var Server = require("./lib/server");
} catch (err) {

View file

@ -39,7 +39,7 @@
"socket.io": "^1.4.0",
"socket.io-redis": "^1.0.0",
"source-map-support": "^0.4.0",
"status-message-polyfill": "calzoneman/status-message-polyfill",
"status-message-polyfill": "git://github.com/calzoneman/status-message-polyfill",
"uuid": "^2.0.1",
"yamljs": "^0.1.6"
},