]> 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>
Sun, 29 Oct 2017 23:13:37 +0000 (16:13 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 29 Oct 2017 23:13:37 +0000 (16:13 -0700)

Trivial merge