]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge remote-tracking branch 'twitter/master' into poveropt
authorRod Vagg <rod@vagg.org>
Mon, 7 Nov 2011 01:02:51 +0000 (12:02 +1100)
committerRod Vagg <rod@vagg.org>
Mon, 7 Nov 2011 01:02:51 +0000 (12:02 +1100)
commitd725ac2feb0abc1469ff526a29de2cf426639ad2
tree675ee94201a0cb2a9e033407d30b8bd8afd3224f
parent4d2e32e80914dbc526dcde7c743b0537ded7c853
parentb15e24e3d460ef2cbe20f13c648b42024be096fa
Merge remote-tracking branch 'twitter/master' into poveropt

Conflicts:
js/bootstrap-popover.js
docs/javascript.html
js/bootstrap-popover.js
js/bootstrap-twipsy.js