Merge branch 'master' into docs_derp
Conflicts: _layouts/default.html components.html
Showing
_data/glyphicons.yml
0 → 100644
| { | { | ||
| "name": "twbs/bootstrap" | "name": "twbs/bootstrap", | ||
| , "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development." | "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.", | ||
| , "keywords": ["bootstrap", "css"] | "keywords": ["bootstrap", "css"], | ||
| , "homepage": "http://getbootstrap.com" | "homepage": "http://getbootstrap.com", | ||
| , "authors": [ | "authors": [ | ||
| { | { | ||
| "name": "Mark Otto", | "name": "Mark Otto", | ||
| "email": "markdotto@gmail.com" | "email": "markdotto@gmail.com" | ||
| }, | }, | ||
| { | { | ||
| "name": "Jacob Thornton", | "name": "Jacob Thornton", | ||
| "email": "jacobthornton@gmail.com" | "email": "jacobthornton@gmail.com" | ||
| } | } | ||
| ] | ], | ||
| , "support": { | "support": { | ||
| "issues": "https://github.com/twbs/bootstrap/issues" | "issues": "https://github.com/twbs/bootstrap/issues" | ||
| }, | |||
| "license": "MIT", | |||
| "extra": { | |||
| "branch-alias": { | |||
| "dev-master": "3.0.x-dev" | |||
| } | } | ||
| , "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.
| ... | @@ -7,11 +7,11 @@ | ... | @@ -7,11 +7,11 @@ |
| "author": "Twitter, Inc.", | "author": "Twitter, Inc.", | ||
| "scripts": { "test": "grunt test" }, | "scripts": { "test": "grunt test" }, | ||
| "repository": { | "repository": { | ||
| "type": "git" | "type": "git", | ||
| , "url": "https://github.com/twbs/bootstrap.git" | "url": "https://github.com/twbs/bootstrap.git" | ||
| }, | }, | ||
| "bugs": { | "bugs": { | ||
| "url": "https://github.com/twbs/bootstrap/issues" | "url": "https://github.com/twbs/bootstrap/issues" | ||
| }, | }, | ||
| "licenses": [ | "licenses": [ | ||
| { | { | ||
| ... | @@ -33,7 +33,7 @@ | ... | @@ -33,7 +33,7 @@ |
| "grunt-contrib-qunit": "~0.3.0", | "grunt-contrib-qunit": "~0.3.0", | ||
| "grunt-contrib-uglify": "~0.2.4", | "grunt-contrib-uglify": "~0.2.4", | ||
| "grunt-contrib-watch": "~0.5.3", | "grunt-contrib-watch": "~0.5.3", | ||
| "grunt-csscomb": "~1.1.0", | "grunt-csscomb": "~1.2.1", | ||
| "grunt-html-validation": "~0.1.11", | "grunt-html-validation": "~0.1.11", | ||
| "grunt-jekyll": "~0.4.0", | "grunt-jekyll": "~0.4.0", | ||
| "grunt-jscs-checker": "~0.2.5", | "grunt-jscs-checker": "~0.2.5", | ||
| ... | ... |
Please register or sign in to comment