]> 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>
Fri, 3 Mar 2017 19:32:34 +0000 (11:32 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Mar 2017 19:32:34 +0000 (11:32 -0800)

Trivial merge