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
Showing
Please register or sign in to comment
Conflicts: docs/assets/css/docs.css docs/javascript.html docs/templates/pages/javascript.mustache