]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commit657ff31c7448563abc7b11e0cfea971e060a3d3d
tree32d3b6fbe651e28b9240e9f5ee3d36add31e08af
parent97b4364452aa45539aac11d866ebd17fa211200d
parent66e140db82d367710013707a327c67d67168b3c9
Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar

Conflicts:
docs/_includes/components/progress-bars.html
docs/assets/js/src/application.js