Merge branch 'master' into gh-pages
Showing
.gitattributes
0 → 100644
browserstack.json
deleted
100644 → 0
| ... | ... | @@ -19,7 +19,7 @@ |
| , "license": "Apache-2.0" | ||
| , "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "3.0.x-dev" | ||
| "dev-master": "3.0.x-dev" | ||
| } | ||
| } | ||
| } |
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.0.2" | ||
| , "version": "3.0.3" | ||
| , "keywords": ["bootstrap", "css"] | ||
| , "homepage": "http://getbootstrap.com" | ||
| , "author": "Twitter, Inc." | ||
| ... | ... | @@ -20,8 +20,7 @@ |
| } | ||
| ] | ||
| , "devDependencies": { | ||
| "browserstack-runner": "~0.0.12" | ||
| , "btoa": "~1.1.1" | ||
| "btoa": "~1.1.1" | ||
| , "grunt": "~0.4.1" | ||
| , "grunt-contrib-clean": "~0.5.0" | ||
| , "grunt-contrib-concat": "~0.3.0" | ||
| ... | ... | @@ -33,8 +32,20 @@ |
| , "grunt-contrib-watch": "~0.5.3" | ||
| , "grunt-html-validation": "~0.1.6" | ||
| , "grunt-jekyll": "~0.4.0" | ||
| , "grunt-recess": "~0.4.0" | ||
| , "grunt-recess": "~0.5.0" | ||
| , "grunt-saucelabs": "~4.1.2" | ||
| , "grunt-sed": "~0.1.1" | ||
| , "regexp-quote": "~0.0.0" | ||
| } | ||
| , "jspm": { | ||
| "main": "js/bootstrap" | ||
| , "directories": { "lib": "dist" } | ||
| , "shim": { | ||
| "js/bootstrap": { | ||
| "imports": "jquery" | ||
| , "exports": "$" | ||
| } | ||
| } | ||
| , "buildConfig": { "uglify": true } | ||
| } | ||
| } |