]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Thu, 15 Jan 2015 23:51:12 +0000 (15:51 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 15 Jan 2015 23:51:12 +0000 (15:51 -0800)

Trivial merge