Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-08-11 22:53:13 +02:00
parent 2899f152fb
commit 4fa1f613e4
35 changed files with 378 additions and 275 deletions

View File

@@ -2,16 +2,17 @@
"name": "phraseanet",
"version": "3.9.0",
"devDependencies": {
"bower": "latest",
"bower": "~1.3",
"mocha-phantomjs": ">=2.0 <3.0",
"recess": ">=1.1.0 <1.1.7",
"tmp": "0.0.23",
"uglify-js": "latest",
"jake": "latest",
"grunt-cli": "latest",
"grunt": "~0.4.1",
"grunt-shell": "~0.6",
"grunt-contrib": "~0.4.0",
"grunt-bower-task": "~0.3.0",
"grunt-bower-task": "~0.4.0",
"grunt-bower-postinst": "~0.2.0",
"grunt-mocha-phantomjs": "~0.3.0"
}