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 /examples/screenshots | |
| 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 'examples/screenshots')
| -rw-r--r-- | examples/screenshots/cover.jpg | bin | 0 -> 36631 bytes |
| -rw-r--r-- | examples/screenshots/dashboard.jpg | bin | 0 -> 105375 bytes |
| -rw-r--r-- | examples/screenshots/jumbotron.jpg | bin | 122180 -> 101215 bytes |
| -rw-r--r-- | examples/screenshots/theme.jpg | bin | 95407 -> 85467 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/examples/screenshots/cover.jpg b/examples/screenshots/cover.jpg Binary files differnew file mode 100644 index 000000000..2a81259de --- /dev/null +++ b/examples/screenshots/cover.jpg diff --git a/examples/screenshots/dashboard.jpg b/examples/screenshots/dashboard.jpg Binary files differnew file mode 100644 index 000000000..fb7b0526d --- /dev/null +++ b/examples/screenshots/dashboard.jpg diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg Binary files differindex 60c0b79c2..30c11a2c8 100644 --- a/examples/screenshots/jumbotron.jpg +++ b/examples/screenshots/jumbotron.jpg diff --git a/examples/screenshots/theme.jpg b/examples/screenshots/theme.jpg Binary files differindex ef47acb9c..ad527b55a 100644 --- a/examples/screenshots/theme.jpg +++ b/examples/screenshots/theme.jpg |
