Merge branch 'master' of git-ungleich:dynamicweb

This commit is contained in:
rascencio 2015-09-16 01:31:17 -06:00
commit d7ba34f7c1
3 changed files with 64 additions and 53 deletions

2
.gitignore vendored
View file

@ -15,7 +15,6 @@ media/*
!media/keep
CACHE/
static/
\#*#
.\#*
@ -27,5 +26,4 @@ node_modules/
ungleich.db
*~*
static/
secret-key