]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflicts
authorMark Otto <mark.otto@twitter.com>
Mon, 22 Aug 2011 03:33:54 +0000 (20:33 -0700)
committerMark Otto <mark.otto@twitter.com>
Mon, 22 Aug 2011 03:33:54 +0000 (20:33 -0700)
commit34a19915f4f8b53eb7a5f2ffa4c87f7d47853827
treeb19acf3b786b3c4e0af9a1ffc44f3e08f82ed591
parent027538e66d633b15c9074b14d206602ad8fb42a1
parent842ad01fce710c50dc9c0174ab790f91e66c46b1
resolve conflicts
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
lib/patterns.less
lib/preboot.less