Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into indev-prism

Browse Source
This commit is contained in:
Amish Shah
2016-12-30 18:05:29 +00:00
parent 69ccc75590 50dc9addf1
commit 56e01291e2
12 changed files with 198 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -7,7 +7,7 @@
"scripts": {
"test": "eslint src && docgen --source src --custom docs/index.yml",
"docs": "docgen --source src --custom docs/index.yml --output docs/docs.json",
"test-docs": "docgen --source src --custom docs",
"test-docs": "docgen --source src --custom docs/index.yml",
"lint": "eslint src",
"web-dist": "node ./node_modules/parallel-webpack/bin/run.js"
},
@@ -32,6 +32,7 @@
"runkitExampleFilename": "./docs/examples/ping.js",
"dependencies": {
"@types/node": "^6.0.0",
"long": "^3.2.0",
"pako": "^1.0.0",
"prism-media": "hydrabolt/prism-media#master",
"superagent": "^3.3.0",