Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts: _layouts/customize.html
Showing
browserstack.json
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
| ... | @@ -26,5 +26,6 @@ | ... | @@ -26,5 +26,6 @@ |
| , "grunt-contrib-qunit": "~0.2.2" | , "grunt-contrib-qunit": "~0.2.2" | ||
| , "grunt-contrib-watch": "~0.5.1" | , "grunt-contrib-watch": "~0.5.1" | ||
| , "grunt-recess": "~0.3.3" | , "grunt-recess": "~0.3.3" | ||
| , "browserstack-runner": "~0.0.11" | |||
| } | } | ||
| } | } |
Please register or sign in to comment