diff options
| author | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
| commit | ccd963e622bdcadc8a79f5b8c1bb770b09f63f20 (patch) | |
| tree | 64c97dbd98648791b2eb04682e25dcc6610f5aa4 /docs/upgrading.html | |
| parent | e8647c1b118d2c726a8987e9a41aad82da972b57 (diff) | |
| parent | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (diff) | |
| download | bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.tar.xz bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
Diffstat (limited to 'docs/upgrading.html')
0 files changed, 0 insertions, 0 deletions