moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of git.ungleich.ch:dynamicweb into develop

Browse source 
Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt
This commit is contained in:
rascencio 2015-09-19 17:02:36 +02:00
commit acca06a11d
10 changed files with 169 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -13,7 +13,6 @@ local_settings.py
media/*
!media/keep
/CACHE/
/static/
@ -21,8 +20,11 @@ media/*
.\#*
*~
static/
secret-key
node_modules/
*.db
ungleich.db
*~*
secret-key