Fix: merge conflic /portal/views.py
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Aug 2013 22:49:28 +0000 (00:49 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Aug 2013 22:49:28 +0000 (00:49 +0200)
commita6e8a7f63aa2d97ec9974b54cd485b4359e296c7
treecab2952ccc9d262b952c26a83c3776909905848c
parent43ee08c820533a61c01f1e9ee51e0452aadd7aa9
parent02555f32d9a8ef363a7e2bf0e8ef894bc44f2459
Fix: merge conflic /portal/views.py
portal/views.py