Fix: merge conflic /portal/views.py
[myslice.git] / portal / migrations / __init__.py