Merge remote-tracking branch 'peterdavehello/upgrade-dependencies'

Conflicts:
	package.json
This commit is contained in:
Thaddee Tyl 2015-04-26 19:43:33 +02:00
commit 923f681393

View File

@ -17,16 +17,16 @@
},
"dependencies": {
"dot": "~1.0.3",
"svgo": "~0.4.2",
"svgo": "~0.5.1",
"canvas": "~1.1.2",
"phantomjs": "~1.9.2-6",
"es6-promise": "~0.1.1",
"request": "~2.34.0",
"redis": "~0.10.1",
"camp": "~13.11.9",
"semver": "~2.3.0",
"bower": "~1.3.11",
"promise": "~6.1.0"
"es6-promise": "~2.1.0",
"request": "~2.55.0",
"redis": "~0.12.1",
"camp": "~14.10.12",
"semver": "~4.3.3",
"bower": "~1.4.1",
"promise": "~7.0.0"
},
"devDependencies": {
"ass": "~0.0.6",