Merge branch 'master' into derp
Conflicts: _config.yml dist/css/bootstrap-theme.css.map dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/glyphicons.html docs/_includes/css/forms.html docs/_includes/css/tables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/header.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/dropdowns.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/javascript.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.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/c...
Showing
+1263 -617
... | ... | @@ -31,12 +31,12 @@ |
}, | ||
"devDependencies": { | ||
"btoa": "~1.1.2", | ||
"glob": "~4.0.3", | ||
"glob": "~4.0.4", | ||
"grunt": "~0.4.5", | ||
"grunt-autoprefixer": "~0.8.1", | ||
"grunt-autoprefixer": "~0.8.2", | ||
"grunt-banner": "~0.2.3", | ||
"grunt-contrib-clean": "~0.5.0", | ||
"grunt-contrib-concat": "~0.4.0", | ||
"grunt-contrib-clean": "~0.6.0", | ||
"grunt-contrib-concat": "~0.5.0", | ||
"grunt-contrib-connect": "~0.8.0", | ||
"grunt-contrib-copy": "~0.5.0", | ||
"grunt-contrib-csslint": "~0.2.0", | ||
... | ... | @@ -47,12 +47,12 @@ |
"grunt-contrib-qunit": "~0.5.2", | ||
"grunt-contrib-uglify": "~0.5.0", | ||
"grunt-contrib-watch": "~0.6.1", | ||
"grunt-csscomb": "~2.0.1", | ||
"grunt-exec": "~0.4.5", | ||
"grunt-csscomb": "~3.0.0", | ||
"grunt-exec": "~0.4.6", | ||
"grunt-html-validation": "~0.1.18", | ||
"grunt-jekyll": "~0.4.2", | ||
"grunt-jscs": "~0.6.1", | ||
"grunt-saucelabs": "~8.1.1", | ||
"grunt-saucelabs": "~8.2.0", | ||
"grunt-sed": "~0.1.1", | ||
"load-grunt-tasks": "~0.6.0", | ||
"markdown": "~0.5.0", | ||
... | ... |
Please register or sign in to comment