diff options
| author | Mark Otto <[email protected]> | 2013-08-05 16:03:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-05 16:03:10 -0700 |
| commit | 04dc22103706519dfc48c6634351a66a3218221f (patch) | |
| tree | db41dd228717589b7a67727913e1c5ddfe74bd83 /browserstack.json | |
| parent | 9bbe8a020a9082cbec011c8fae66bc5ffc8fe5bd (diff) | |
| parent | 1aedb7862ccf93bb983652bc24c11cc9f01699d3 (diff) | |
| download | bootstrap-04dc22103706519dfc48c6634351a66a3218221f.tar.xz bootstrap-04dc22103706519dfc48c6634351a66a3218221f.zip | |
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
Diffstat (limited to 'browserstack.json')
0 files changed, 0 insertions, 0 deletions