]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v3.4.0-dev' of https://github.com/twbs/bootstrap into v3.4.0-dev
authorMark Otto <markdotto@gmail.com>
Sun, 26 Nov 2017 02:06:49 +0000 (18:06 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 26 Nov 2017 02:06:49 +0000 (18:06 -0800)

Trivial merge