]> 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>
Sun, 27 Nov 2016 00:49:07 +0000 (16:49 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 27 Nov 2016 00:49:07 +0000 (16:49 -0800)

Trivial merge