Commit c2c02d10 authored by Jacob Thornton's avatar Jacob Thornton
Browse files

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

parents d4659521 e7e8db96
3 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!13512.0 wip - relative font sizes
Showing with 0 additions and 1 deletion
+0 -1
......@@ -145,7 +145,6 @@
break
}
debugger
if (this.options['z-index']) tp['z-index'] = this.options['z-index']
$tip
......
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