]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 413c8a6 5ead87d)
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)
committerMark Otto <otto@github.com>
Wed, 15 Jan 2014 05:45:10 +0000 (21:45 -0800)
Conflicts:
docs/assets/js/customize.min.js


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