Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
authorFrancesco Pontillo <francescopontillo@gmail.com>
Thu, 16 May 2013 07:59:08 +0000 (09:59 +0200)
committerFrancesco Pontillo <francescopontillo@gmail.com>
Thu, 16 May 2013 07:59:08 +0000 (09:59 +0200)
commit2ec92281b988c129d4eb2ef5efffef57c011f9cc
tree91dfccb9c590480b37f254c99c5cdea366fea283
parent266c8ea28da92dc14fe6cb4207c149f3153141a5
parent5a8fb4bf1b64d06e5ca148eb4619a1c692d2dded
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