]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a93a6b ecc6d98)
Merge branch 'master' into carousel_indicators_ie
authorMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:49:18 +0000 (16:49 -0700)
committerMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:49:18 +0000 (16:49 -0700)
Conflicts:
dist/css/bootstrap.min.css


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