diff options
| author | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
| commit | 31956be6ef6d1b1a2537c3441e69120ef3c99a2b (patch) | |
| tree | a118376f0f415826265828377904778f8e788b44 /docs/examples/offcanvas | |
| parent | 510f4fe50ad30499adf1d19dd65ef694c414aacd (diff) | |
| parent | be18f50fd0e36e35342a100216b01fe00692d0db (diff) | |
| download | bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.tar.xz bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
Diffstat (limited to 'docs/examples/offcanvas')
| -rw-r--r-- | docs/examples/offcanvas/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 1df7bca9d..d9182a247 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -25,7 +25,7 @@ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> </head> |