]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into restore_grid_mixins 11050/head
authorMark Otto <otto@github.com>
Mon, 14 Oct 2013 01:59:40 +0000 (18:59 -0700)
committerMark Otto <otto@github.com>
Mon, 14 Oct 2013 01:59:40 +0000 (18:59 -0700)
commitbf73f1f9d3ccb4e3753066b2d697e99b94a0f155
treefa33f487db14527a2cb69e73ef59ef181ec58584
parent265fda7903e189ee0d2d7201cc92bf384fc53043
parent6351c30782a87fe03d5c27e75f2287cc657ba06d
Merge branch 'master' into restore_grid_mixins

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css