]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 14 Oct 2013 20:45:57 +0000 (13:45 -0700)
committerMark Otto <otto@github.com>
Mon, 14 Oct 2013 20:45:57 +0000 (13:45 -0700)
commitfa64846acfef78487859e5e9f311ea401ee4c1cd
tree643a560d9c2a6b8ad9cd59f32e96fb358aca64f9
parent710071157751dc9aac1b531d283c1ae756a3c902
parent3fb1381a30146398d775a8951f924b58614b6c6c
Merge branch 'master' of github.com:twbs/bootstrap

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