]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12091b9 68b8083)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 04:19:43 +0000 (21:19 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 3 Oct 2014 04:19:43 +0000 (21:19 -0700)
Conflicts:
docs/assets/js/raw-files.min.js


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