Merge branch 'master' of github.com:flokuep/VocaluxeWebsite

Conflicts:
	.gitignore
This commit is contained in:
Florian Küpper committed 2016-12-13 21:35:04 +01:00
commit 80d5bc2f11
1 file changed
+2 -2
+2 -2
View File
@@ -1,3 +1,3 @@
_site
.sass-cache
_site/
.sass-cache/
.jekyll-metadata