]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 00:09:32 +0000 (16:09 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 00:09:32 +0000 (16:09 -0800)
commit7e6797880a969de8b3d44be91dbc765b6ab48612
tree6078fa9bad27d829eaeb6bf9016399a8f75702e1
parent8ff621aa26dee69088b527089cdd719bce68be31
parent03d2128f5072791ca4578a4e50a4540df7c9d121
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

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