]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
committerMark Otto <markotto@twitter.com>
Mon, 27 Feb 2012 07:15:36 +0000 (23:15 -0800)
commitccf7697185488850e7450bfb05092bebc2004084
tree41b5d3222ef99ffd376ffeb2b2a6d0dbb2c75b44
parent6abb2059eb44b53c78bd61c72ad6eb3a83c70457
parent74a3c763b47e146e354624cea56b73fbf514ad97
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/javascript.html
docs/templates/pages/javascript.mustache