/portal/urls.py: Merge conflict solved
[myslice.git] / auth / js /
drwxr-xr-x   ..
-rw-r--r-- 476 logout.js