Merge remote-tracking branch 'origin/feature/djangohosting' into feature/notifybymail

This commit is contained in:
Nico Schottelius 2015-08-27 18:31:59 +02:00
commit b72dd9c3ca
8 changed files with 8 additions and 2 deletions

4
.gitignore vendored
View file

@ -14,8 +14,8 @@ local_settings.py
media/*
!media/keep
CACHE/
static/
/CACHE/
/static/
\#*#
.\#*