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
..
migrations	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
static/digitalglarus	Merge branch 'master' of git.ungleich.ch:dynamicweb into develop	2015-09-19 17:02:36 +02:00
templates/digitalglarus	removed conflict on digitalglarus/contact.html	2015-09-19 08:25:34 -06:00
__init__.py	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
admin.py	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
models.py	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
tests.py	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
urls.py	adding digital glarus landing page and fixed price image	2015-09-16 01:11:39 -06:00
views.py	adding digital glarus landing page and fixed price image	2015-09-16 01:11:39 -06:00