diff options
| author | Mark Otto <[email protected]> | 2012-01-23 11:25:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-23 11:25:16 -0800 |
| commit | 22fa3712598f6c7d7bcff44ed5ce01f96cbc6ca6 (patch) | |
| tree | dbeda3a602dd2cb89a30ba820730c5738c420455 /docs | |
| parent | 1209a3756c88043008950f74dd287b837e00f7d8 (diff) | |
| parent | 782c994060a984c10d73fdd3cc8e3fe33a2e4477 (diff) | |
| download | bootstrap-22fa3712598f6c7d7bcff44ed5ce01f96cbc6ca6.tar.xz bootstrap-22fa3712598f6c7d7bcff44ed5ce01f96cbc6ca6.zip | |
Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
Conflicts:
bootstrap.css
bootstrap.min.css
lib/type.less
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions