diff options
| author | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
| commit | cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6 (patch) | |
| tree | 9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9 /examples | |
| parent | 3f1e4b92eefaee617115973eba98fc7cc0905ab8 (diff) | |
| parent | 8c5dc542a553d93d4ee26db176e515f5164be8a7 (diff) | |
| download | bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.tar.xz bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.zip | |
Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/screenshots/jumbotron.jpg | bin | 77911 -> 122180 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg Binary files differindex 46bce0c53..60c0b79c2 100644 --- a/examples/screenshots/jumbotron.jpg +++ b/examples/screenshots/jumbotron.jpg |
