Fix: merge conflic /portal/views.py
[myslice.git] / plugins / hazelnut / static / img /
2013-08-08 Jordan Augéunfold: better management of static files thanks to...