]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into thumbnail-extend 12620/head
authorMark Otto <otto@github.com>
Fri, 7 Feb 2014 02:52:03 +0000 (18:52 -0800)
committerMark Otto <otto@github.com>
Fri, 7 Feb 2014 02:52:03 +0000 (18:52 -0800)
commitace0abfdb6cc6d603a98afce85718345c32f9157
treeb8b2bdf197341edaa9f632cb192fae7d5c1b9811
parentfda8d91c86a29cceab93285d920db56f7f26aaf8
parent596495c89bd6019c4a2949771b48234daecfd4cb
Merge branch 'master' into thumbnail-extend

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