]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11414
authorMark Otto <otto@github.com>
Thu, 28 Nov 2013 23:55:17 +0000 (15:55 -0800)
committerMark Otto <otto@github.com>
Thu, 28 Nov 2013 23:55:17 +0000 (15:55 -0800)
commitb5f9cc20578fb57b2b69e10cf32bba55f9c940e4
tree72b6c245b35c2c6783bc43d4add6ce0e1e65b801
parent0da3901ed5a6d498af8b7c76b61d004a003f716b
parent0be94180b99cec9be239124c666721e40fbfbc97
Merge branch 'master' into pr/11414

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