Merge branch 'develop' into feature/jekyll

This commit is contained in:
Marco Biedermann 2015-02-27 13:54:05 +01:00
commit fd7e7b611c

3
.gitignore vendored
View File

@ -15,3 +15,6 @@ Desktop.ini
Thumb.db
Thumbs.db
nbproject
_site
.sass-cache