Merge remote-tracking branch 'twbs/v4-dev' into v4-dev

27cf3d67 · Pierre-Denis Vanduynslager · f0c0a753 · 8e4f3fe7 · 27cf3d67 · 27cf3d67
Commit 27cf3d67 authored 8 years ago by Pierre-Denis Vanduynslager
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2264 additions and 1647 deletions
+2264 -1647
--- a/grunt/bs-sass-compile/sass.js
+++ b/grunt/bs-sass-compile/sass.js
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
--- a/grunt/gcp-key.json.enc
+++ b/grunt/gcp-key.json.enc
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
--- a/grunt/postcss.js
+++ b/grunt/postcss.js
--- a/grunt/upload-preview.sh
+++ b/grunt/upload-preview.sh
--- a/js/.eslintrc
+++ b/js/.eslintrc
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
--- a/js/.jscsrc
+++ b/js/.jscsrc
--- a/js/dist/alert.js
+++ b/js/dist/alert.js
--- a/js/dist/alert.js.map
+++ b/js/dist/alert.js.map
--- a/js/dist/button.js
+++ b/js/dist/button.js
--- a/js/dist/button.js.map
+++ b/js/dist/button.js.map
--- a/js/dist/carousel.js
+++ b/js/dist/carousel.js
--- a/js/dist/carousel.js.map
+++ b/js/dist/carousel.js.map
--- a/js/dist/collapse.js
+++ b/js/dist/collapse.js
--- a/js/dist/collapse.js.map
+++ b/js/dist/collapse.js.map
--- a/js/dist/dropdown.js
+++ b/js/dist/dropdown.js
--- a/js/dist/dropdown.js.map
+++ b/js/dist/dropdown.js.map
--- a/js/dist/modal.js
+++ b/js/dist/modal.js