Merge branch 'master' into production
This commit is contained in:
commit
8a63661800
13 changed files with 251 additions and 6 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -284,6 +284,8 @@ fabric.properties
|
|||
# Test blog posts
|
||||
/markdownblog/mdfiles/*
|
||||
/envvars.env
|
||||
<<<<<<< HEAD
|
||||
|
||||
# ignore static files
|
||||
/markdownblog/static/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue