]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b593df1 3887f54)
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Wed, 6 Nov 2013 22:04:54 +0000 (14:04 -0800)
committerMark Otto <otto@github.com>
Wed, 6 Nov 2013 22:04:54 +0000 (14:04 -0800)
Conflicts:
dist/css/bootstrap.min.css


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