aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/img/examples
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-31 14:38:06 -0800
committerJacob Thornton <[email protected]>2012-01-31 14:38:06 -0800
commitcabba91c7c74fcf6dd80bef8b3ea2717eec997b3 (patch)
tree4441de5b2eadadbad8134a7054d0c5cce1a92aa2 /docs/assets/img/examples
parent334e5f25c4a6e9f75aa415724ac9d4fa0fbee055 (diff)
parentc84b5cf5f52ad9be72adf9de2956baad1d6e025b (diff)
downloadbootstrap-cabba91c7c74fcf6dd80bef8b3ea2717eec997b3.tar.xz
bootstrap-cabba91c7c74fcf6dd80bef8b3ea2717eec997b3.zip
Merge branch '2.0-wip'
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/img/examples')
-rw-r--r--docs/assets/img/examples/bootstrap-example-fluid.jpgbin0 -> 25832 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-hero.jpgbin0 -> 22280 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-starter.jpgbin0 -> 7182 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.jpg b/docs/assets/img/examples/bootstrap-example-fluid.jpg
new file mode 100644
index 000000000..151b987cb
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-fluid.jpg
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-hero.jpg b/docs/assets/img/examples/bootstrap-example-hero.jpg
new file mode 100644
index 000000000..cd4a32107
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-hero.jpg
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-starter.jpg b/docs/assets/img/examples/bootstrap-example-starter.jpg
new file mode 100644
index 000000000..09c8a066d
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-starter.jpg
Binary files differ