Merge branch 'master' into django-work

2017-02-02 00:52:03 -05:00
parent 07ad08d16c 1ba6a282df
commit 7ccb10179c
1 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,8 @@ coverage.xml
 *.log
 local_settings.py
 staticfiles
+static/css
+*/migrations

 # Flask stuff:
 instance/
@@ -78,6 +80,10 @@ celerybeat-schedule

 # dotenv
 .env
+keys.sh
+
+# sass
+.sass-cache

 # virtualenv
 venv/