diff options
| author | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
| commit | 06f1293acfc767d950adc329cf4abfc2b5c0b78d (patch) | |
| tree | 738abb0672d3e0a5839a8657c431a202aa190ef0 /docs/assets | |
| parent | d91d9b0ade9165c20d781ced128a751d0ae1fbda (diff) | |
| parent | a2f08158d032c1025ca0c6bf411b8282b606fb7b (diff) | |
| download | bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.tar.xz bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.zip | |
Merge branch 'master' into panels_and_tables
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' + |