]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3a1396 59f847e)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)
committerMark Otto <otto@github.com>
Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)
Conflicts:
docs/assets/js/bootstrap.min.js


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