Merge branch 'master' into docs_derp
Conflicts: _layouts/default.html
Showing
LICENSE-MIT
deleted
100644 → 0
| ... | ... | @@ -16,7 +16,7 @@ |
| , "support": { | ||
| "issues": "https://github.com/twbs/bootstrap/issues" | ||
| } | ||
| , "license": "Apache-2.0" | ||
| , "license": "MIT" | ||
| , "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "3.0.x-dev" | ||
| ... | ... |
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.
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.3", | ||
| "version": "3.1.0", | ||
| "keywords": ["bootstrap", "css"], | ||
| "homepage": "http://getbootstrap.com", | ||
| "author": "Twitter, Inc.", | ||
| ... | ... | @@ -15,8 +15,8 @@ |
| }, | ||
| "licenses": [ | ||
| { | ||
| "type": "Apache-2.0", | ||
| "url": "http://www.apache.org/licenses/LICENSE-2.0" | ||
| "type": "MIT", | ||
| "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" | ||
| } | ||
| ], | ||
| "devDependencies": { | ||
| ... | ... |
Please register or sign in to comment