]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6841c50 1d1bd62)
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 05:59:33 +0000 (22:59 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 05:59:33 +0000 (22:59 -0700)
Conflicts:
dist/js/bootstrap.min.js


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