mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

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
2011-12-09 11:33:02 -08:00
parent b12b71bf7c cee2f61898
commit 312ee6cdfb
12 changed files with 90 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/javascript.html
+1 -1
View File
@@ -757,7 +757,7 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
</section>
<!-- Button
<!-- Button
================================================== -->
<section id="button">