diff options
| author | Mark Otto <[email protected]> | 2013-01-31 17:57:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-31 17:57:31 -0800 |
| commit | 83e5c01856fbc7003ea949ac5c2416339145426e (patch) | |
| tree | d28b3672179e6cc71ce30b5835c7c6619875ff62 /docs/getting-started.html | |
| parent | d30f47efb2580b0f435128940b48d5e5d30ca529 (diff) | |
| parent | baadc33c88f701a068d468e15500ed87b84df43b (diff) | |
| download | bootstrap-83e5c01856fbc7003ea949ac5c2416339145426e.tar.xz bootstrap-83e5c01856fbc7003ea949ac5c2416339145426e.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
Diffstat (limited to 'docs/getting-started.html')
| -rw-r--r-- | docs/getting-started.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/getting-started.html b/docs/getting-started.html index 88ceb0001..e336c3347 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -185,10 +185,11 @@ <html> <head> <title>Bootstrap 101 Template</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> <body> <h1>Hello, world!</h1> - <script src="http://code.jquery.com/jquery-latest.js"></script> + <script src="http://code.jquery.com/jquery.js"></script> </body> </html> </pre> @@ -198,12 +199,13 @@ <html> <head> <title>Bootstrap 101 Template</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <!-- Bootstrap --> <link href="css/bootstrap.min.css" rel="stylesheet" media="screen"> </head> <body> <h1>Hello, world!</h1> - <script src="http://code.jquery.com/jquery-latest.js"></script> + <script src="http://code.jquery.com/jquery.js"></script> <script src="js/bootstrap.min.js"></script> </body> </html> |