Merge branch 'master' into indev-prism

This commit is contained in:
Schuyler Cebulskie
2017-02-06 01:54:31 -05:00
17 changed files with 167 additions and 120 deletions

View File

@@ -35,13 +35,13 @@
"@types/node": "^7.0.0",
"long": "^3.2.0",
"pako": "^1.0.0",
"prism-media": "hydrabolt/prism-media#master",
"superagent": "^3.3.0",
"prism-media": "hydrabolt/prism-media",
"superagent": "^3.4.0",
"tweetnacl": "^0.14.0",
"ws": "^2.0.0"
},
"peerDependencies": {
"bufferutil": "^1.3.0",
"bufferutil": "^2.0.0",
"erlpack": "hammerandchisel/erlpack",
"node-opus": "^0.2.0",
"opusscript": "^0.0.2",
@@ -65,7 +65,7 @@
"prism-media": false,
"opusscript": false,
"node-opus": false,
"tweet-nacl": false,
"tweetnacl": false,
"sodium": false,
"src/sharding/Shard.js": false,
"src/sharding/ShardClientUtil.js": false,