git.roojs.org Git - bootswatch/commit

projects / bootswatch / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 13418ac b1f9c0d)

author	Francesco Pontillo <francescopontillo@gmail.com>
	Mon, 18 Mar 2013 22:32:44 +0000 (23:32 +0100)
committer	Francesco Pontillo <francescopontillo@gmail.com>
	Mon, 18 Mar 2013 22:32:44 +0000 (23:32 +0100)
commit	266c8ea28da92dc14fe6cb4207c149f3153141a5
tree	43f22caf29ec3125debe36f0e64739183477a3e2	tree \| snapshot
parent	13418ac9e709c85cfbaba501efb69c8bdff7ddd4	commit \| diff
parent	b1f9c0d9eaabf6bd07f34ed17cc1b8d99447a109	commit \| diff

Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
shamrock/index.html

14 files changed:

amelia/index.html	diff1 \|	diff2 \|	blob \| history
cerulean/index.html	diff1 \|	diff2 \|	blob \| history
cosmo/index.html	diff1 \|	diff2 \|	blob \| history
cyborg/index.html	diff1 \|	diff2 \|	blob \| history
default/index.html	diff1 \|	diff2 \|	blob \| history
index.html	diff1 \|	diff2 \|	blob \| history
journal/index.html	diff1 \|	diff2 \|	blob \| history
readable/index.html	diff1 \|	diff2 \|	blob \| history
simplex/index.html	diff1 \|	diff2 \|	blob \| history
slate/index.html	diff1 \|	diff2 \|	blob \| history
spacelab/index.html	diff1 \|	diff2 \|	blob \| history
spruce/index.html	diff1 \|	diff2 \|	blob \| history
superhero/index.html	diff1 \|	diff2 \|	blob \| history
united/index.html	diff1 \|	diff2 \|	blob \| history

Bootstrap watch themes