aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-03 21:50:03 -0800
committerMark Otto <[email protected]>2014-03-03 21:50:03 -0800
commit2ece8dd33616bc2e7f753d108810df7eeac7c3a9 (patch)
tree88376b4fca645a8c2fa6267d301d92c0bf639919 /package.json
parentb22f064c2ee38dbd84635d91b8a809a8923f5bfd (diff)
parente381635b1faf7480bcf54618804a62dd4a049a93 (diff)
downloadbootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.tar.xz
bootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.zip
Merge branch 'master' into rtl_via_css_flip
Diffstat (limited to 'package.json')
-rw-r--r--package.json29
1 files changed, 17 insertions, 12 deletions
diff --git a/package.json b/package.json
index 1b64c92e5..9610cc1d4 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,15 @@
{
"name": "bootstrap",
- "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
+ "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.1.1",
"keywords": [
- "bootstrap",
- "css"
+ "css",
+ "less",
+ "mobile-first",
+ "responsive",
+ "front-end",
+ "framework",
+ "web"
],
"homepage": "http://getbootstrap.com",
"author": "Twitter, Inc.",
@@ -26,29 +31,29 @@
},
"devDependencies": {
"btoa": "~1.1.1",
- "canonical-json": "~0.0.3",
+ "canonical-json": "~0.0.4",
"grunt": "~0.4.2",
- "grunt-banner": "~0.2.0",
+ "grunt-banner": "~0.2.1",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.3.0",
- "grunt-contrib-connect": "~0.7.0",
+ "grunt-contrib-connect": "~0.7.1",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-csslint": "~0.2.0",
- "grunt-contrib-cssmin": "~0.8.0",
+ "grunt-contrib-cssmin": "~0.9.0",
"grunt-contrib-jade": "~0.10.0",
"grunt-contrib-jshint": "~0.8.0",
- "grunt-contrib-less": "~0.9.0",
+ "grunt-contrib-less": "~0.10.0",
"grunt-contrib-qunit": "~0.4.0",
- "grunt-contrib-uglify": "~0.3.0",
+ "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-csscomb": "~2.0.1",
"grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.13",
"grunt-jekyll": "~0.4.1",
- "grunt-jscs-checker": "~0.3.0",
- "grunt-saucelabs": "~5.0.0",
+ "grunt-jscs-checker": "~0.4.0",
+ "grunt-saucelabs": "~5.0.1",
"grunt-sed": "~0.1.1",
- "load-grunt-tasks": "~0.3.0",
+ "load-grunt-tasks": "~0.4.0",
"markdown": "~0.5.0",
"css-flip": "~0.3.0"
},