]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Mon, 10 Nov 2014 07:12:02 +0000 (23:12 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 10 Nov 2014 07:12:02 +0000 (23:12 -0800)

Trivial merge