From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 22 Aug 2013 16:37:38 +0000 (+0200)
Subject: /portal/urls.py: Merge conflict solved
X-Git-Tag: myslice-0.2-1~41^2~6^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b29e145eaceb0b2a8f98bfaa7118713159e8c39e;hp=b29e145eaceb0b2a8f98bfaa7118713159e8c39e;p=myslice.git

/portal/urls.py: Merge conflict solved
---