mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge remote-tracking branch 'upstream/master' into node-requirable

Browse Source 
Conflicts:
	Gruntfile.js
This commit is contained in:
James Friend
2014-08-28 09:32:08 +08:00
parent e7991a9a1e 35f09315ed
commit 9aeaf19b1d
174 changed files with 18513 additions and 4600 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+21 -21
View File
@@ -1,7 +1,7 @@
{
"name": "bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"version": "3.1.1",
"version": "3.2.0",
"keywords": [
"css",
"less",
@@ -31,34 +31,34 @@
"url": "https://github.com/twbs/bootstrap/blob/master/LICENSE"
},
"devDependencies": {
"btoa": "~1.1.1",
"canonical-json": "~0.0.4",
"glob": "^4.0.0",
"grunt": "~0.4.4",
"grunt-autoprefixer": "~0.7.2",
"grunt-banner": "~0.2.2",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.4.0",
"btoa": "~1.1.2",
"glob": "~4.0.5",
"grunt": "~0.4.5",
"grunt-autoprefixer": "~1.0.1",
"grunt-banner": "~0.2.3",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-concat": "~0.5.0",
"grunt-contrib-connect": "~0.8.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-csslint": "~0.2.0",
"grunt-contrib-cssmin": "~0.9.0",
"grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-jade": "~0.12.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.11.0",
"grunt-contrib-qunit": "~0.5.1",
"grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-less": "~0.11.4",
"grunt-contrib-qunit": "~0.5.2",
"grunt-contrib-uglify": "~0.5.1",
"grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~2.0.1",
"grunt-exec": "~0.4.5",
"grunt-html-validation": "~0.1.15",
"grunt-jekyll": "~0.4.1",
"grunt-jscs-checker": "~0.4.3",
"grunt-saucelabs": "~8.0.2",
"grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6",
"grunt-html-validation": "~0.1.18",
"grunt-jekyll": "~0.4.2",
"grunt-jscs": "~0.6.2",
"grunt-saucelabs": "~8.3.1",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.5.0",
"load-grunt-tasks": "~0.6.0",
"markdown": "~0.5.0",
"time-grunt": "~0.3.1"
"npm-shrinkwrap": "~3.1.8",
"time-grunt": "~1.0.0"
},
"engines": {
"node": "~0.10.1"