diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
| commit | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (patch) | |
| tree | 0d896dedbbd47723ab769b139b63a5a58778e578 /examples/screenshots | |
| parent | 3bfa630d2afe70452861b2466daab78daa47dda8 (diff) | |
| parent | 4afcebe0e71aafd0cfb501548a6591effdbe2e70 (diff) | |
| download | bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.tar.xz bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.zip | |
Merge branch 'master' into pr/11107
Conflicts:
docs-assets/js/raw-files.js
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 | 77911 -> 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 46bce0c53..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 |
