]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflict
authorMark Otto <mark.otto@twitter.com>
Fri, 9 Sep 2011 06:02:13 +0000 (23:02 -0700)
committerMark Otto <mark.otto@twitter.com>
Fri, 9 Sep 2011 06:02:13 +0000 (23:02 -0700)
commit1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf
treefc67e274699dd774de3aefadf95635bf071d9b74
parentba08055a7be248582ce6b5ba00bf04f5c821bcdd
parent5960711d0f79f7031b444bafba9a856c77f697bc
resolve conflict
bootstrap-1.3.0.css
bootstrap-1.3.0.min.css
docs/index.html
lib/patterns.less