Merge branch 'gh-pages' of github.com:cozy-labs/cozy-light into gh-pages · lesion/cozy-light@9bbf2c5 · GitHub

Commit

Merge branch 'gh-pages' of github.com:cozy-labs/cozy-light into gh-pages

Browse files

Conflicts:
	index.html

Loading branch information

Frank Rousseau committed Jan 22, 2015

2 parents 1ef33f3 + e1257ba commit 9bbf2c5