]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
authorMark Otto <markotto@twitter.com>
Sun, 3 Jun 2012 05:14:12 +0000 (22:14 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 3 Jun 2012 05:14:12 +0000 (22:14 -0700)
commit9a4ee790e1e58e321b604bb66380b2ce2f00faf6
treeac9099103a98153aeb5d69c674af5546c6aa926b
parent9a3a297a478e1a27cce913b8d30170a6949b52f7
parent2d3a0babd242d7eebe09cf3f4daad38e2d7df6ee
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js