Mark Otto 163e68ade6 resolve merge conflict

2011-07-01 22:16:29 -07:00

..

bootstrap.less

Merge branch 'master' of http://git.local.twitter.com/bootstrap

2011-06-30 10:44:04 -07:00

forms.less

misc updates to docs and form bug fix

2011-07-01 22:15:16 -07:00

patterns.less

add twipsies...

2011-07-01 21:30:12 -07:00

preboot.less

Updated offset columns, fix app.js bug, misc tweaks to copy

2011-06-30 15:56:25 -07:00

reset.less

clean up commented out css, slightly updated docs again

2011-06-30 00:15:37 -07:00

scaffolding.less

Updated offset columns, fix app.js bug, misc tweaks to copy

2011-06-30 15:56:25 -07:00

tables.less

Updated offset columns, fix app.js bug, misc tweaks to copy

2011-06-30 15:56:25 -07:00

type.less

Merge branch 'master' of http://git.local.twitter.com/bootstrap

2011-06-29 17:11:02 -07:00