Your Name d57fc21784 resolve merge conflict		2016-03-22 15:12:47 +00:00
..
settings	resolve merge conflict	2016-03-22 15:12:47 +00:00
settings-test	changes on prod - master	2016-03-05 19:46:46 +00: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 remote-tracking branch 'refs/remotes/origin/master'	2016-03-05 19:57:41 +00:00
wsgi.py	changes on prod - master	2016-03-05 19:46:46 +00:00