Merge branch 'master' into derp
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less
Showing
docs/_data/browser-bugs.yml
0 → 100644
docs/_plugins/bridge.rb
0 → 100644
docs/_plugins/bugify.rb
0 → 100644
docs/assets/css/src/docs.css
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
grunt/configBridge.json
0 → 100644
| { | { | ||
| "name": "bootstrap", | "name": "bootstrap", | ||
| "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | ||
| "version": "3.2.0", | "version": "3.3.0", | ||
| "keywords": [ | "keywords": [ | ||
| "css", | "css", | ||
| "less", | "less", | ||
| ... | @@ -56,8 +56,8 @@ | ... | @@ -56,8 +56,8 @@ |
| "grunt-saucelabs": "~8.3.2", | "grunt-saucelabs": "~8.3.2", | ||
| "grunt-sed": "~0.1.1", | "grunt-sed": "~0.1.1", | ||
| "load-grunt-tasks": "~1.0.0", | "load-grunt-tasks": "~1.0.0", | ||
| "markdown": "~0.5.0", | |||
| "npm-shrinkwrap": "~4.0.0", | "npm-shrinkwrap": "~4.0.0", | ||
| "remarkable": "^1.2.2", | |||
| "time-grunt": "~1.0.0" | "time-grunt": "~1.0.0" | ||
| }, | }, | ||
| "engines": { | "engines": { | ||
| ... | ... |
Please register or sign in to comment