Raul Ascencio acca06a11d Merge branch 'master' of git.ungleich.ch:dynamicweb into develop ... Conflicts: .gitignore dynamicweb/settings.py requirements.txt		2015-09-19 17:02:36 +02:00
..
css	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
img	Merge branch 'master' of git.ungleich.ch:dynamicweb into develop	2015-09-19 17:02:36 +02:00
js	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00