74cacbdb5b
Conflicts: symposion_project/requirements/base.txt |
||
---|---|---|
.. | ||
apps | ||
docs | ||
fixtures | ||
requirements | ||
static | ||
templates | ||
__init__.py | ||
manage.py | ||
settings.py | ||
urls.py | ||
wsgi.py |
74cacbdb5b
Conflicts: symposion_project/requirements/base.txt |
||
---|---|---|
.. | ||
apps | ||
docs | ||
fixtures | ||
requirements | ||
static | ||
templates | ||
__init__.py | ||
manage.py | ||
settings.py | ||
urls.py | ||
wsgi.py |