]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Tue, 24 Dec 2013 20:17:48 +0000 (12:17 -0800)
committerMark Otto <otto@github.com>
Tue, 24 Dec 2013 20:17:48 +0000 (12:17 -0800)
commit5c2dfbf33b133a5e31035df970ffa05585eba422
tree522b5814714b2df5064e441959d515a5ea4a89a0
parent679c7862374be9b742862923181302f76b3a8c06
parent25390716ea2a0bf9cd476858c826775d68c2f1cf
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
docs-assets/js/raw-files.js
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
js/modal.js
js/scrollspy.js
js/tooltip.js