/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)
commitb29e145eaceb0b2a8f98bfaa7118713159e8c39e
tree660eae2eed32715a07795e606da1da3037f14c70
parentb5b1c487c354a2f66be7c4dc1f92ab514af76554
parentd4026f144d75beda0142ba35011c4323704745b4
/portal/urls.py: Merge conflict solved
myslice/viewutils.py
portal/urls.py
portal/views.py