/portal/urls.py: Merge conflict solved
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 22 Aug 2013 16:37:38 +0000 (18:37 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 22 Aug 2013 16:37:38 +0000 (18:37 +0200)

No differences found