]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Sun, 3 Aug 2014 23:18:41 +0000 (16:18 -0700)
committerMark Otto <otto@github.com>
Sun, 3 Aug 2014 23:18:41 +0000 (16:18 -0700)
commitae9c1609329ff4e033635105aba7ec4aa9899ffb
treef3fefbf1191b8cafda4b3f439d98ff7eb9970787
parentde77d04899f596359a57bafc09ebe8c453e85d2c
parent6424acf69ae40a916db04b5c3235f1780f11b4be
Merge branch 'master' into derp

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/forms.less
less/tables.less