Merge branch 'master' of github.com:flokuep/VocaluxeWebsite
Conflicts: .gitignore
This commit is contained in:
commit
80d5bc2f11
1 file changed
+2
-2
+2
-2
@@ -1,3 +1,3 @@
|
||||
_site
|
||||
.sass-cache
|
||||
_site/
|
||||
.sass-cache/
|
||||
.jekyll-metadata
|
||||
Reference in new issue
Block a user