diff options
| author | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
| commit | d88e743b417c3e149c9fcb02c8d5580afb8baee0 (patch) | |
| tree | d8018f676ed81eb5ec5dcbfbb990ca4aa6d300fd /browserstack.json | |
| parent | fddcadbc21cf35fb584ab02dc0817612da6596a4 (diff) | |
| parent | 725e2b9ccf66cd54e64ff5d15bf8b2744b5122cd (diff) | |
| download | bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.tar.xz bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'browserstack.json')
0 files changed, 0 insertions, 0 deletions