diff options
| author | Mark Otto <[email protected]> | 2011-10-22 15:51:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-22 15:51:24 -0700 |
| commit | fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00 (patch) | |
| tree | 1a5eaa04a4938a0c26ee092c7bc457f578bf5ebb /lib/responsive.less | |
| parent | d4675bf4ef8019fc80e3b6816d3597c07cde81df (diff) | |
| parent | 2e09ffe3832106fab60dc01cc3159c13029bdf68 (diff) | |
| download | bootstrap-fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00.tar.xz bootstrap-fb7fbdb278cc76c597acb69de5cd3a5d6eb77b00.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
lib/responsive.less
Diffstat (limited to 'lib/responsive.less')
0 files changed, 0 insertions, 0 deletions