rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto 2012-01-25 11:27:29 -08:00
commit e24bd40b4a
11 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/base-css.html
View file

@ -25,7 +25,7 @@
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->