Commit b54c07b5 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' of http://git.local.twitter.com/baseline

parents 7c4d1775 f852a71f
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Twitter Bootstrap</title> <title>Twitter Bootstrap</title>
<!-- delete this markymarkusson -->
<!-- Le styles --> <!-- Le styles -->
<link href="../bootstrap.css" rel="stylesheet" type="text/css"> <link href="../bootstrap.css" rel="stylesheet" type="text/css">
......
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