Tomislav R 4389230b60 :Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop ... Conflicts: dynamicweb/settings-test/__init__.py requirements.txt templates/cms/ungleich.ch/_footer.html templates/cms/ungleich.ch/_header_base.html templates/cms/ungleich.ch/_menu.html templates/cms/ungleich.ch/base.html templates/cms/ungleich.ch/blog.html templates/cms/ungleich.ch/page.html templates/cms/ungleichch/__init__.py templates/cms/ungleichch/_footer.html templates/cms/ungleichch/_header_base.html templates/cms/ungleichch/_menu.html templates/cms/ungleichch/base.html templates/cms/ungleichch/blog.html templates/cms/ungleichch/page.html ungleich/templates/cms/ungleichch/_footer.html ungleich/templates/cms/ungleichch/_header_base.html ungleich/templates/cms/ungleichch/_menu.html ungleich/templates/cms/ungleichch/base_ungleich.html ungleich/templates/cms/ungleichch/blog_ungleich.html ungleich/templates/cms/ungleichch/page.html		2016-04-22 10:08:33 +02:00
..
settings	Changing database name from app_new to app	2016-04-10 16:23:30 -05:00
settings-test	:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop	2016-04-22 10:08:33 +02:00
.gitignore	support local settings	2015-05-14 01:19:55 +02:00
__init__.py	Init	2015-05-02 01:30:30 +02:00
urls.py	wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop	2016-04-22 10:04:00 +02:00
wsgi.py	changes on prod - master	2016-03-05 19:46:46 +00:00