Merge branch 'master' into indev-prism

This commit is contained in:
Schuyler Cebulskie
2017-01-07 03:42:39 -05:00
32 changed files with 186 additions and 100 deletions

View File

@@ -40,13 +40,13 @@
"ws": "^1.1.1"
},
"peerDependencies": {
"erlpack": "hammerandchisel/erlpack#master",
"erlpack": "hammerandchisel/erlpack",
"node-opus": "^0.2.0",
"opusscript": "^0.0.1",
"uws": "^0.12.0"
},
"devDependencies": {
"discord.js-docgen": "hydrabolt/discord.js-docgen#master",
"discord.js-docgen": "hydrabolt/discord.js-docgen",
"eslint": "^3.12.0",
"parallel-webpack": "^1.6.0",
"uglify-js": "mishoo/UglifyJS2#harmony",