]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e7010 aa5f090)
Merge branch 'bs3_jekyll' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)
committerMark Otto <otto@github.com>
Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)
Conflicts:
docs/css.html
docs/templates/pages/css.mustache


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git