diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
| commit | 46c3d27468accdf98dd49257f17bdc507890a1c6 (patch) | |
| tree | 9067b23767a152c8cb58f2a2d24bf1276e407e5b /examples/screenshots | |
| parent | aad447e29075b52a46931be17a9be4016cc89ef1 (diff) | |
| parent | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (diff) | |
| download | bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.tar.xz bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.zip | |
Merge branch 'master' into pr/11435
Conflicts:
dist/css/bootstrap.css
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 | 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 |
