diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
| commit | 2ec92281b988c129d4eb2ef5efffef57c011f9cc (patch) | |
| tree | 91dfccb9c590480b37f254c99c5cdea366fea283 /amelia/thumbnail.png | |
| parent | 266c8ea28da92dc14fe6cb4207c149f3153141a5 (diff) | |
| parent | 5a8fb4bf1b64d06e5ca148eb4619a1c692d2dded (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
amelia/index.html
cerulean/index.html
cosmo/index.html
cyborg/index.html
default/index.html
index.html
journal/index.html
readable/index.html
simplex/index.html
slate/index.html
spacelab/index.html
spruce/index.html
superhero/index.html
united/index.html
Diffstat (limited to 'amelia/thumbnail.png')
| -rw-r--r-- | amelia/thumbnail.png | bin | 49749 -> 22484 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/amelia/thumbnail.png b/amelia/thumbnail.png Binary files differindex 5e1bd27c..be116cd4 100644 --- a/amelia/thumbnail.png +++ b/amelia/thumbnail.png |
