]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a3a297 2d3a0ba)
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)
Conflicts:
docs/assets/js/bootstrap.min.js


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git