diff options
| author | Mark Otto <[email protected]> | 2011-10-31 23:28:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-10-31 23:28:05 -0700 |
| commit | 5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6 (patch) | |
| tree | a74e445e94d83adab5267124907e423eaaa8b35e /docs | |
| parent | a21363a749f7d30a282e24cefd83840a5a3fca7c (diff) | |
| parent | 602919aae83a0f6d12a2c3dcdcdb8c3f1579b647 (diff) | |
| download | bootstrap-5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6.tar.xz bootstrap-5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6.zip | |
Merge branch 'kriansa-patch1' into dev
Conflicts:
bootstrap.css
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions