Commit Graph

6 Commits

Author SHA1 Message Date
Jacob Thornton cd556cfacd remake for version 1.3 2011-09-16 11:24:45 -07:00
Jacob Thornton c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Mark Otto e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -07:00
Mark Otto 8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Jacob Thornton 472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00