/portal/urls.py: Merge conflict solved
[myslice.git] / debian / myslice.install
1 usr/share/unfold/plugins