Skip to content
GitLab
Commit 7ce048bc authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

parents cd441e08 802ced9c
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
+0 -1
js/bootstrap-transition.js
+ 0
- 1
View file @ 7ce048bc
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend' , 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd otransitionend' , 'OTransition' : 'oTransitionEnd otransitionend'
, 'msTransition' : 'MSTransitionEnd'
, 'transition' : 'transitionend' , 'transition' : 'transitionend'
} }
, name , name
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment