2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
This commit is contained in:
Mark Otto
2012-11-05 18:27:25 -08:00
40 changed files with 62 additions and 59 deletions
+1 -1
View File
@@ -84,7 +84,7 @@
<a href="./extend.html" >Extend</a>
</li>
<li>
Version 2.2.1
Version 2.2.2
</li>
</ul>
</div>