]> 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>
Wed, 6 Jan 2016 23:01:41 +0000 (15:01 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 6 Jan 2016 23:01:41 +0000 (15:01 -0800)

Trivial merge