diff options
| author | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-07-24 00:24:25 -0700 |
| commit | 5b2f2ed82181c651626b541aee6963f74bf8be31 (patch) | |
| tree | 31706cdec9278f49a03544385d45e8572af1f98f /docs/assets/js/bootstrap.js | |
| parent | 4ea7c472358e2d77f76193ed3c1bafd641dd74ae (diff) | |
| parent | 7ce048bccd618bbae794a9115861d1927664b8ed (diff) | |
| download | bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.tar.xz bootstrap-5b2f2ed82181c651626b541aee6963f74bf8be31.zip | |
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 3df16ac2c..7ca46ac78 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -36,7 +36,7 @@ , transEndEventNames = { 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' - , 'OTransition' : 'otransitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' } |