Tomislav R f7ec020838 :Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar ... Conflicts: dynamicweb/urls.py		2016-04-23 19:08:23 +02:00
..
settings	digitalglarus booking update	2016-04-23 19:00:20 +02: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	:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar	2016-04-23 19:08:23 +02:00
wsgi.py	changes on prod - master	2016-03-05 19:46:46 +00:00