Commit 5b671847 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

parents d5ad502d ccbc606d
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<title>Static</title> <title>Static</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="/webjars/bootstrap/3.0.3/css/bootstrap.min.css" /> href="webjars/bootstrap/3.0.3/css/bootstrap.min.css" />
</head> </head>
<body> <body>
<script type="text/javascript" <script type="text/javascript"
src="/webjars/jquery/2.0.3/jquery.min.js"></script> src="webjars/jquery/2.0.3/jquery.min.js"></script>
<div id="navbar" class="navbar navbar-default" role="navigation"> <div id="navbar" class="navbar navbar-default" role="navigation">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" <button type="button" class="navbar-toggle" data-toggle="collapse"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="/"> Home </a></li> <li><a href="./"> Home </a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -34,6 +34,6 @@ ...@@ -34,6 +34,6 @@
</p> </p>
</div> </div>
<script type="text/javascript" <script type="text/javascript"
src="/webjars/bootstrap/3.0.3/js/bootstrap.min.js"></script> src="webjars/bootstrap/3.0.3/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment