Merge branch 'master' into boulox-responsive-embed
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/css.html docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
Showing
This diff is collapsed.
| { | { | ||
| "name": "twbs/bootstrap", | "name": "twbs/bootstrap", | ||
| "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.", | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | ||
| "keywords": ["bootstrap", "css"], | "keywords": [ | ||
| "css", | |||
| "js", | |||
| "less", | |||
| "mobile-first", | |||
| "responsive", | |||
| "front-end", | |||
| "framework", | |||
| "web" | |||
| ], | |||
| "homepage": "http://getbootstrap.com", | "homepage": "http://getbootstrap.com", | ||
| "authors": [ | "authors": [ | ||
| { | { | ||
| ... | ... |
dist/css/bootstrap-rtl.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
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.
No preview for this file type
This diff is collapsed.
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.
docs/_data/core-team.yml
0 → 100644
docs/_data/sass-team.yml
0 → 100644
docs/_data/showcase.yml
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/assets/css/docs.min.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
3.04 KB
docs/assets/img/devices.png
0 → 100644
6.5 KB
14.2 KB
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/browser-bugs.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/examples/rtl/index.html
0 → 100644
This diff is collapsed.
docs/examples/rtl/rtl.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
docs/migration.html
0 → 100644
This diff is collapsed.
docs/robots.txt
0 → 100644
This diff is collapsed.
docs/sitemap.xml
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
grunt/.jshintrc
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
grunt/shrinkwrap.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
test-infra/README.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.