]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-docs-streamlined
authorMark Otto <markdotto@gmail.com>
Mon, 5 Sep 2016 23:21:58 +0000 (16:21 -0700)
committerMark Otto <markdotto@gmail.com>
Mon, 5 Sep 2016 23:21:58 +0000 (16:21 -0700)

Trivial merge