]> 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 Jun 2016 04:48:53 +0000 (21:48 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Jun 2016 04:48:53 +0000 (21:48 -0700)

Trivial merge