]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12b5d46 fab9ab8)
Merge branch 'master' into docs-theme-toggler 13463/head
authorMark Otto <otto@github.com>
Fri, 23 May 2014 01:54:25 +0000 (18:54 -0700)
committerMark Otto <otto@github.com>
Fri, 23 May 2014 01:54:25 +0000 (18:54 -0700)
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css

1  2 
docs/_includes/header.html patch | diff1 | diff2 | blob | history

diff --cc docs/_includes/header.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git