Changeset - 2f89311d4225
Merge
!
!
!
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
49 files changed with 275 insertions and 231 deletions:
0 comments (0 inline, 0 general)
0 comments (0 inline, 0 general)