Jannis Gebauer 24d75ebe45 resolved merge conflicts		2016-05-22 20:18:08 +02:00
..
settings	resolved merge conflicts	2016-05-22 20:18:08 +02:00
__init__.py	Change repo_name to project_slug for clarity.	2016-04-20 10:00:35 -07:00
urls.py	Change repo_name to project_slug for clarity.	2016-04-20 10:00:35 -07:00
wsgi.py	Updated whitenoise configuration to match changes in version 3.0	2016-05-08 11:55:32 +01:00