aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-06 23:18:39 -0800
committerMark Otto <[email protected]>2014-03-06 23:18:39 -0800
commit61c9e9df4b13acc4124ddae58c1eaa40081a90f7 (patch)
treea556eac890c0bc4e1a8c4efe4ebf01522dec82b0 /package.json
parent705ff7f2275ca823f71ca8dfba27a3b68119a2a4 (diff)
parent73ad81d89ca346e2eb147824bea8fdcfd90220e1 (diff)
downloadbootstrap-61c9e9df4b13acc4124ddae58c1eaa40081a90f7.tar.xz
bootstrap-61c9e9df4b13acc4124ddae58c1eaa40081a90f7.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'package.json')
-rw-r--r--package.json7
1 files changed, 5 insertions, 2 deletions
diff --git a/package.json b/package.json
index 3132b3ff8..eae9e933e 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
"grunt-contrib-qunit": "~0.4.0",
"grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.5.3",
- "grunt-css-flip": "^0.1.0",
"grunt-csscomb": "~2.0.1",
+ "grunt-css-flip": "^0.1.0",
"grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.13",
"grunt-jekyll": "~0.4.1",
@@ -57,7 +57,10 @@
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.4.0",
"markdown": "~0.5.0",
- "css-flip": "~0.3.0"
+ "time-grunt": "~0.2.10"
+ },
+ "engines": {
+ "node": "~0.10.1"
},
"jspm": {
"main": "js/bootstrap",