]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'fix/badge-default-colors' of https://github.com/jonwolski/bootstrap...
authorMark Otto <markdotto@gmail.com>
Sun, 20 Aug 2017 20:35:06 +0000 (13:35 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 20 Aug 2017 20:35:06 +0000 (13:35 -0700)

Trivial merge