Files
@ 2f89311d4225
Branch filter:
Location: symposion_app/requirements-test.txt - annotation
2f89311d4225
213 B
text/plain
Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master
Conflicts:
symposion/cms/urls.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/urls.py
symposion/schedule/urls.py
symposion/sponsorship/urls.py
Conflicts:
symposion/cms/urls.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/urls.py
symposion/schedule/urls.py
symposion/sponsorship/urls.py