]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Mon, 1 Dec 2014 01:11:24 +0000 (17:11 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 1 Dec 2014 01:11:24 +0000 (17:11 -0800)

Trivial merge