]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97b4364 66e140d)
Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap...
authorMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 21:17:14 +0000 (14:17 -0700)
committerMark Otto <markdotto@gmail.com>
Sun, 26 Oct 2014 21:17:14 +0000 (14:17 -0700)
Conflicts:
docs/_includes/components/progress-bars.html
docs/assets/js/src/application.js


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