]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 23 Dec 2011 03:15:09 +0000 (19:15 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 23 Dec 2011 03:15:09 +0000 (19:15 -0800)
commit35fdbad24b908714ff1a1221945598527a641863
tree0a054ac3f3b913fb16f71731b4b04472311afc4a
parent87ac818253a26bcf09fa55f78ae3f55759c54e64
parent9fb380151d477f1741b7609ade7a9e7fd5450b2c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
lib/mixins.less