aboutsummaryrefslogtreecommitdiff
path: root/browserstack.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-11 16:15:12 -0700
committerMark Otto <[email protected]>2013-09-11 16:15:12 -0700
commitb0ea3a08cde1a4507cc0f171cbe335407a84b738 (patch)
treee74b3c874b0555adc5c2255d77aff07b32949aa2 /browserstack.json
parent2dc7ab4bbb70abfcdb0aa179935c72ddbb3e66e5 (diff)
parent6519303549732d61de9e2905916f64a7d5b76910 (diff)
downloadbootstrap-b0ea3a08cde1a4507cc0f171cbe335407a84b738.tar.xz
bootstrap-b0ea3a08cde1a4507cc0f171cbe335407a84b738.zip
Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
Conflicts: getting-started.html less/responsive-utilities.less
Diffstat (limited to 'browserstack.json')
0 files changed, 0 insertions, 0 deletions