Skip to content

Commit 094ba17

Browse files
author
bchevalier
committed
Merge branch 'master' of github.com:Wizcorp/Jeff
Conflicts: package.json
2 parents 0639b07 + 00d4998 commit 094ba17

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
test
22
npm-debug.log
3+
node_modules

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
},
1313
"main": "./lib/index.js",
1414
"dependencies": {
15-
"canvas": "1.1.6",
16-
"glob": "4.3.1",
17-
"image-optim": "0.3.0",
18-
"commander": "2.2.0",
19-
"fs-extra": "0.8.1",
20-
"async": "0.2.10",
21-
"js-beautify": "1.4.2",
22-
"node-pngquant-native": "0.0.12"
15+
"async": "0.2.10",
16+
"buffer-crc32": "^0.2.5",
17+
"canvas": "1.1.6",
18+
"commander": "2.2.0",
19+
"fs-extra": "0.8.1",
20+
"glob": "4.3.1",
21+
"image-optim": "0.3.0",
22+
"js-beautify": "1.4.2",
23+
"node-pngquant-native": "0.0.12"
2324
},
2425
"repository": {
2526
"type": "git",

0 commit comments

Comments
 (0)