]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into carousel_indicators_ie
authorMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:49:18 +0000 (16:49 -0700)
committerMark Otto <otto@github.com>
Sun, 20 Oct 2013 23:49:18 +0000 (16:49 -0700)
commitac6a7f044e71bc2aa7a7aee1700b204ebd7a20bf
treec20b801f73ce46f95a7f2b537e7021f68d9b7235
parent6a93a6b88a4b874fba5a1d1edd817cbd91ccfacc
parentecc6d9873ff3f69b69a92fe739d8e20fd68e63cd
Merge branch 'master' into carousel_indicators_ie

Conflicts:
dist/css/bootstrap.min.css