]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjamino...
authorMark Otto <markotto@twitter.com>
Wed, 18 Jul 2012 03:57:20 +0000 (20:57 -0700)
committerMark Otto <markotto@twitter.com>
Wed, 18 Jul 2012 03:57:20 +0000 (20:57 -0700)
commita1ad6d124a2ad22b9afcd16d90fc572b10fa9ffc
tree64aa65e12bba037f61c34b11b5d8ff4cc94658b6
parent62f6368344cd4d76eb7e10be209f9fe62e4456cf
parent426e7d9fbd87421e56a76e17a19de97a6e08c460
Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

Conflicts:
docs/extend.html
docs/templates/pages/extend.mustache
docs/extend.html
docs/templates/pages/extend.mustache