]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 16 Sep 2011 18:24:07 +0000 (11:24 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 16 Sep 2011 18:24:07 +0000 (11:24 -0700)
commitc7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee
tree75c97593b25066d9c2d7bd76eef24e23d1f106d3
parentaa432390888bae158bbc3014eed9af55103d03aa
parent427a001c476569684027567e5a7cec89058185ad
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less