Merge branch 'develop' of git-ungleich:dynamicweb into develop

This commit is contained in:
rascencio 2015-09-15 11:16:02 -06:00
commit 81207b8e12
106 changed files with 189 additions and 473 deletions

4
.gitignore vendored
View file

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