Merge branch 'master' into v4
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/input-groups.html docs/_includes/components/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css 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/dist/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
| { | { | ||
| "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.3.0", | "version": "3.3.1", | ||
| "keywords": [ | "keywords": [ | ||
| "css", | "css", | ||
| "less", | "less", | ||
| ... | @@ -32,13 +32,13 @@ | ... | @@ -32,13 +32,13 @@ |
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "btoa": "~1.1.2", | "btoa": "~1.1.2", | ||
| "glob": "~4.0.6", | "glob": "~4.2.1", | ||
| "grunt": "~0.4.5", | "grunt": "~0.4.5", | ||
| "grunt-autoprefixer": "~1.0.1", | "grunt-autoprefixer": "~2.0.0", | ||
| "grunt-banner": "~0.2.3", | "grunt-banner": "~0.2.3", | ||
| "grunt-contrib-clean": "~0.6.0", | "grunt-contrib-clean": "~0.6.0", | ||
| "grunt-contrib-concat": "~0.5.0", | "grunt-contrib-concat": "~0.5.0", | ||
| "grunt-contrib-connect": "~0.8.0", | "grunt-contrib-connect": "~0.9.0", | ||
| "grunt-contrib-copy": "~0.7.0", | "grunt-contrib-copy": "~0.7.0", | ||
| "grunt-contrib-csslint": "~0.3.1", | "grunt-contrib-csslint": "~0.3.1", | ||
| "grunt-contrib-cssmin": "~0.10.0", | "grunt-contrib-cssmin": "~0.10.0", | ||
| ... | @@ -52,12 +52,12 @@ | ... | @@ -52,12 +52,12 @@ |
| "grunt-exec": "~0.4.6", | "grunt-exec": "~0.4.6", | ||
| "grunt-html-validation": "~0.1.18", | "grunt-html-validation": "~0.1.18", | ||
| "grunt-jekyll": "~0.4.2", | "grunt-jekyll": "~0.4.2", | ||
| "grunt-jscs": "~0.8.1", | "grunt-jscs": "~1.0.0", | ||
| "grunt-saucelabs": "~8.3.2", | "grunt-saucelabs": "~8.3.3", | ||
| "grunt-sed": "~0.1.1", | "grunt-sed": "~0.1.1", | ||
| "load-grunt-tasks": "~1.0.0", | "load-grunt-tasks": "~1.0.0", | ||
| "npm-shrinkwrap": "~4.0.0", | "npm-shrinkwrap": "5.0.0", | ||
| "remarkable": "^1.2.2", | "remarkable": "~1.4.2", | ||
| "time-grunt": "~1.0.0" | "time-grunt": "~1.0.0" | ||
| }, | }, | ||
| "engines": { | "engines": { | ||
| ... | ... |
This diff is collapsed.