]> 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>
Tue, 24 Jan 2012 22:33:52 +0000 (14:33 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 22:33:52 +0000 (14:33 -0800)
commit5f209ed810b17fa88ad9683d1888f14965b19f9e
tree193a14f9c9d61f0e5eee5dd5ebd192758570fdb8
parentfbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce
parent58f7fd308a5c4511cf9a10a12c89d550c469b3f1
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

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