]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'v4-dev' into v4a2 18479/head
authorMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 17:51:02 +0000 (09:51 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 17:51:02 +0000 (09:51 -0800)

Trivial merge