]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4-docs-streamlined
authorMark Otto <markdotto@gmail.com>
Sat, 27 May 2017 22:30:06 +0000 (15:30 -0700)
committerMark Otto <markdotto@gmail.com>
Sat, 27 May 2017 22:30:06 +0000 (15:30 -0700)

Trivial merge