]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into panels_and_tables 12633/head
authorMark Otto <otto@github.com>
Sat, 8 Feb 2014 02:36:27 +0000 (18:36 -0800)
committerMark Otto <otto@github.com>
Sat, 8 Feb 2014 02:36:27 +0000 (18:36 -0800)
commit06f1293acfc767d950adc329cf4abfc2b5c0b78d
tree738abb0672d3e0a5839a8657c431a202aa190ef0
parentd91d9b0ade9165c20d781ced128a751d0ae1fbda
parenta2f08158d032c1025ca0c6bf411b8282b606fb7b
Merge branch 'master' into panels_and_tables

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/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css