]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Sun, 3 Aug 2014 01:46:11 +0000 (18:46 -0700)
committerMark Otto <otto@github.com>
Sun, 3 Aug 2014 01:46:11 +0000 (18:46 -0700)
commitde77d04899f596359a57bafc09ebe8c453e85d2c
treece4ad13c50eb0eaa172149801fa9022c2a209951
parent089d434895fbe901d838e4dfb29cdb5941c47ab6
parent67d39404a2ccf6380bbd399f24499eb7659c926e
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/carousel.less