diff options
| author | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
| commit | c8315edd7397cd3b836da67d50a7c5d7eb7de90c (patch) | |
| tree | a8f2a3f4e6682e540aef63dd00b6dcfb13f355ae /docs/assets | |
| parent | a0052b5a3745737777c88409ae08585ce75b285b (diff) | |
| parent | 91b76e5247ef259b8c51672ed95dbbcfd08b7aac (diff) | |
| download | bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.tar.xz bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.zip | |
Merge branch 'master' into pr/12639
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/js/customizer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/customizer.js b/docs/assets/js/customizer.js index 405d87572..d165c4a02 100644 --- a/docs/assets/js/customizer.js +++ b/docs/assets/js/customizer.js @@ -6,7 +6,7 @@ * details, see http://creativecommons.org/licenses/by/3.0/. */ -/* jshint multistr:true */ +/* jshint multistr: true */ window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n' + |