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