/portal/urls.py: Merge conflict solved
[unfold.git] / manifold / css /
2013-08-08 Jordan Augémanifold: imprved plugin class with helpers for naming...