From: Francesco Pontillo Date: Thu, 16 May 2013 07:59:08 +0000 (+0200) Subject: Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages X-Git-Tag: v2.3.2~4^2~2 X-Git-Url: http://git.roojs.org/?p=bootswatch;a=commitdiff_plain;h=2ec92281b988c129d4eb2ef5efffef57c011f9cc 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 --- 2ec92281b988c129d4eb2ef5efffef57c011f9cc