diff options
| author | Mark Otto <[email protected]> | 2012-11-04 12:42:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 12:42:00 -0800 |
| commit | 1af0021014a1c50ac02facd23a36dfc8f74cd143 (patch) | |
| tree | ef31a032f6561d4d0276dac48f77c4e2c6eb448b /less/code.less | |
| parent | 508cc1fef4e11b2f985bff5bd663449676d10b0e (diff) | |
| parent | 22d1506d2325f432dfd35c8380b06f19b8f74441 (diff) | |
| download | bootstrap-1af0021014a1c50ac02facd23a36dfc8f74cd143.tar.xz bootstrap-1af0021014a1c50ac02facd23a36dfc8f74cd143.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
Diffstat (limited to 'less/code.less')
0 files changed, 0 insertions, 0 deletions