diff options
| author | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
| commit | 441e04c84a8a5dd4f55aad61c35c54aded41cc1d (patch) | |
| tree | 19ffb09d1f884c897f2ea32c39244954eaab02ca /examples/grid | |
| parent | ffbec23c982de7496743212afb8d75005e52199c (diff) | |
| parent | 1b814ddd0a5768ff8ee85bef28f026e06fbace93 (diff) | |
| download | bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.tar.xz bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
getting-started.html
Diffstat (limited to 'examples/grid')
| -rw-r--r-- | examples/grid/index.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/grid/index.html b/examples/grid/index.html index 4525f7e49..3cef51e8d 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -5,6 +5,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> + <link rel="shortcut icon" href="../../assets/ico/favicon.png"> <title>Grid Template for Bootstrap</title> @@ -104,5 +105,10 @@ </div> <!-- /container --> + + <!-- Bootstrap core JavaScript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="../../assets/js/respond.min.js"></script> </body> </html> |