/portal/urls.py: Merge conflict solved
[myslice.git] / plugins / senslabmap / static /
2013-08-08 Jordan Augéunfold: better management of static files thanks to...