]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Sat, 23 Aug 2014 20:31:56 +0000 (13:31 -0700)
committerMark Otto <otto@github.com>
Sat, 23 Aug 2014 20:31:56 +0000 (13:31 -0700)

Trivial merge