/portal/urls.py: Merge conflict solved
[myslice.git] / insert_above /
2012-11-21 Thierry Parmentelatinsert_above is integrated for adding js/css on the fly