Raul Ascencio 79b9929b1b Merge branch 'master' of git.ungleich.ch:dynamicweb ... Conflicts: digitalglarus/templates/digitalglarus/base.html digitalglarus/templates/digitalglarus/index.html		2015-09-16 09:58:05 +02:00
..
migrations	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
static/digitalglarus	import new image	2015-09-15 14:52:27 +02:00
templates/digitalglarus	Merge branch 'master' of git.ungleich.ch:dynamicweb	2015-09-16 09:58:05 +02: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