]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into 3.0.0-wip
authorMark Otto <otto@github.com>
Fri, 8 Feb 2013 06:18:53 +0000 (22:18 -0800)
committerMark Otto <otto@github.com>
Fri, 8 Feb 2013 06:18:53 +0000 (22:18 -0800)
commit2aa1a4dc706606e060525907574bb648b773f312
treebaccd787bdbcf45a235c3a042c1510730a24b420
parenta9729c5fd003abbfa0d1ab5bc318a069fd5b1382
parent8c7f9c66a7d12f47f50618ef420868fe836d0c33
Merge branch 'master' into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
js/bootstrap-modal.js
js/bootstrap-tooltip.js
js/bootstrap-typeahead.js