Merge branch 'master' into django-work

This commit is contained in:
2017-02-02 21:53:39 -05:00

4
.gitignore vendored
View File

@@ -53,8 +53,8 @@ coverage.xml
*.log
local_settings.py
staticfiles
static/css
*/migrations
css
migrations
# Flask stuff:
instance/