Pre-merge

This commit is contained in:
Fergal Moran
2015-11-08 19:39:19 +00:00
parent 2d883f5eb0
commit 82494e4b23

1
.gitignore vendored
View File

@@ -14,6 +14,7 @@ static/CACHE/*
dss/localsettings.py
dss/storagesettings.py
dss/celery_settings.py
dss/devsettings.py
dss.conf
dss/debugsettings.py
mysql