git.roojs.org Git - bootswatch/commit

projects / bootswatch / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9393725 9f0a62f)

author	Francesco Pontillo <francescopontillo@gmail.com>
	Sat, 2 Mar 2013 08:42:51 +0000 (09:42 +0100)
committer	Francesco Pontillo <francescopontillo@gmail.com>
	Sat, 2 Mar 2013 08:42:51 +0000 (09:42 +0100)
commit	13418ac9e709c85cfbaba501efb69c8bdff7ddd4
tree	e148a9d633a6d3832be7746d182d3798d64f4cb8	tree \| snapshot
parent	939372574745e895c172f21e1fe3994946fbf760	commit \| diff
parent	9f0a62f7c12c8b91cef0df8189db38711838a051	commit \| diff

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

Conflicts:
component.json
package.json

15 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
shamrock/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