Fix: merge conflict
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Sep 2013 14:33:41 +0000 (16:33 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 23 Sep 2013 14:33:41 +0000 (16:33 +0200)
commit937653fd70bbf7d95bcf870e7f2b46b4a8fec486
tree67038e25517b4a48c8a37a6f68b291723adcba8b
parent460f78080696a2115f1ff4c01cfb9eaafd3f1b18
parent15a3de7c1db8dce6624c9d14139dec7812224bb3
Fix: merge conflict
portal/accountview.py