]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-navbars
authorMark Otto <markdotto@gmail.com>
Wed, 19 Oct 2016 03:03:49 +0000 (20:03 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 19 Oct 2016 03:03:49 +0000 (20:03 -0700)

Trivial merge