]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'colors-redux' of https://github.com/twbs/bootstrap into colors-redux
authorMark Otto <markdotto@gmail.com>
Fri, 30 Jun 2017 06:16:02 +0000 (23:16 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 30 Jun 2017 06:16:02 +0000 (23:16 -0700)

Trivial merge