diff options
| author | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
| commit | c37b710e85e379ddffb305af8a765013c0cd0333 (patch) | |
| tree | 8c23e05b150a14a39c2be90b39d03343b8c994f7 /customize.html | |
| parent | b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f (diff) | |
| parent | e43e87b2f30a9f4967818f1ce8d25a4f88a1f490 (diff) | |
| download | bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.tar.xz bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.zip | |
Merge branch 'master' into pr/11744
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
0 files changed, 0 insertions, 0 deletions