]> 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>
Tue, 8 Dec 2015 08:49:42 +0000 (00:49 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 08:49:42 +0000 (00:49 -0800)

Trivial merge