Merge branch 'master' into docs_derp
Conflicts: _config.yml
Showing
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
docs-assets/ico/favicon.ico
0 → 100644
5.3 KB
887 Bytes
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
| { | ||
| "name": "bootstrap", | ||
| "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", | ||
| "version": "3.1.0", | ||
| "keywords": ["bootstrap", "css"], | ||
| "version": "3.0.3", | ||
| "keywords": [ | ||
| "bootstrap", | ||
| "css" | ||
| ], | ||
| "homepage": "http://getbootstrap.com", | ||
| "author": "Twitter, Inc.", | ||
| "scripts": { "test": "grunt test" }, | ||
| "scripts": { | ||
| "test": "grunt test" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/twbs/bootstrap.git" | ||
| ... | ... | @@ -21,35 +26,40 @@ |
| ], | ||
| "devDependencies": { | ||
| "btoa": "~1.1.1", | ||
| "grunt": "~0.4.1", | ||
| "grunt": "~0.4.2", | ||
| "grunt-banner": "~0.2.0", | ||
| "grunt-contrib-clean": "~0.5.0", | ||
| "grunt-contrib-concat": "~0.3.0", | ||
| "grunt-contrib-connect": "~0.5.0", | ||
| "grunt-contrib-copy": "~0.4.1", | ||
| "grunt-contrib-copy": "~0.5.0", | ||
| "grunt-contrib-csslint": "~0.2.0", | ||
| "grunt-contrib-jshint": "~0.7.0", | ||
| "grunt-contrib-less": "~0.8.0", | ||
| "grunt-contrib-jshint": "~0.8.0", | ||
| "grunt-contrib-less": "~0.8.3", | ||
| "grunt-contrib-qunit": "~0.3.0", | ||
| "grunt-contrib-uglify": "~0.2.4", | ||
| "grunt-contrib-uglify": "~0.2.7", | ||
| "grunt-contrib-watch": "~0.5.3", | ||
| "grunt-csscomb": "~1.2.1", | ||
| "grunt-html-validation": "~0.1.11", | ||
| "grunt-jekyll": "~0.4.0", | ||
| "grunt-jscs-checker": "~0.2.5", | ||
| "grunt-html-validation": "~0.1.13", | ||
| "grunt-jekyll": "~0.4.1", | ||
| "grunt-jscs-checker": "~0.3.0", | ||
| "grunt-saucelabs": "~4.1.2", | ||
| "grunt-sed": "~0.1.1", | ||
| "load-grunt-tasks": "~0.2.0" | ||
| "load-grunt-tasks": "~0.2.1" | ||
| }, | ||
| "jspm": { | ||
| "main": "js/bootstrap", | ||
| "directories": { "lib": "dist" }, | ||
| "directories": { | ||
| "example": "examples", | ||
| "lib": "dist" | ||
| }, | ||
| "shim": { | ||
| "js/bootstrap": { | ||
| "imports": "jquery", | ||
| "exports": "$" | ||
| } | ||
| }, | ||
| "buildConfig": { "uglify": true } | ||
| "buildConfig": { | ||
| "uglify": true | ||
| } | ||
| } | ||
| } |