root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
bootstrap/lib
History
Jacob Thornton 0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
 		2011-09-02 21:04:25 -07:00
..
adaptive.less le merging conflicts 2011-08-29 21:26:53 -07:00
bootstrap.less rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
forms.less fix broken checkbox in ie7 2011-09-02 12:46:47 -07:00
patterns.less Merge branch 'master' of github.com:twitter/bootstrap into js-examples 2011-09-02 21:04:25 -07:00
preboot.less Merge branch 'master' of github.com:twitter/bootstrap into js-examples 2011-09-02 21:04:25 -07:00
reset.less remove repeated table reset 2011-08-29 21:42:44 -07:00
scaffolding.less Merge branch 'master' of github.com:twitter/bootstrap into js-examples 2011-09-02 21:04:25 -07:00
tables.less merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
type.less base import of normalize into the reset css, tweaks to selector specificity across the board 2011-08-25 00:13:40 -07:00