/portal/urls.py: Merge conflict solved
[unfold.git] / apache /
drwxr-xr-x   ..
-rw-r--r-- 714 myslice.conf
-rw-r--r-- 249 myslice.wsgi