]> 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, 19 Mar 2017 22:21:18 +0000 (15:21 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 19 Mar 2017 22:21:18 +0000 (15:21 -0700)

Trivial merge