]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflict
authorMark Otto <mark.otto@twitter.com>
Sat, 3 Sep 2011 05:09:49 +0000 (22:09 -0700)
committerMark Otto <mark.otto@twitter.com>
Sat, 3 Sep 2011 05:09:49 +0000 (22:09 -0700)
commit6d118411e1d456553baf5d09aea15ff13f7b8ef4
treeef84a750770f0b2efee65e204c3085e94cf8f120
parent162534139170e3416cb33a5b5c5093d4a2a5e8f0
parent3c9c85b1ed85ae633d4b94f421020b84d24d9a5c
resolve conflict
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/preboot.less
lib/scaffolding.less