projects / bootswatch / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 266c8ea 5a8fb4b)
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)
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


Trivial merge
Bootstrap watch themes