]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dffd4ff 0adb4e3)
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into...
authorfat <jacobthornton@gmail.com>
Thu, 26 Dec 2013 04:03:28 +0000 (20:03 -0800)
committerfat <jacobthornton@gmail.com>
Thu, 26 Dec 2013 04:03:28 +0000 (20:03 -0800)
commitc25fa0661aa974019664e21517d2122dccf70095
tree356e1b73520ccd25ebc5198e2756d99b66d1f309tree
parentdffd4ffad2b6cad7fb0bab747671d524d791054dcommit | diff
parent0adb4e35f0d773caa6cff65a6f760001089c5ffbcommit | diff
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix

Conflicts:
js/tooltip.js
js/tooltip.js diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git