]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
authorMark Otto <markdotto@gmail.com>
Wed, 18 Oct 2017 21:22:32 +0000 (14:22 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 18 Oct 2017 21:22:32 +0000 (14:22 -0700)

Trivial merge