]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b7b374 91d0a6d)
Merge branch 'master' into modular-the-mixins
authorMark Otto <otto@github.com>
Mon, 10 Mar 2014 20:21:56 +0000 (13:21 -0700)
committerMark Otto <otto@github.com>
Mon, 10 Mar 2014 20:21:56 +0000 (13:21 -0700)

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