]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into carousel_indicators_ie 11186/head
authorMark Otto <otto@github.com>
Mon, 21 Oct 2013 00:45:07 +0000 (17:45 -0700)
committerMark Otto <otto@github.com>
Mon, 21 Oct 2013 00:45:07 +0000 (17:45 -0700)
commitbc76be5dcf0b872a736e0dbf2f2f373ca928234e
tree0309596dcd3029a4a8b424f86fbfa9e2abb63440
parent5e70642dd2ea14f3cff6e245b3f60ee69c97c793
parentf45c05a97a4dda6a657ff89fcbfa283308d0b329
Merge branch 'master' into carousel_indicators_ie

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