]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53c80ed 0c70744)
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 20:43:58 +0000 (13:43 -0700)
committerfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 20:43:58 +0000 (13:43 -0700)
Conflicts:
dist/css/bootstrap.min.css


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