Fix merge conflict: MyAccount
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 4 Sep 2013 09:11:28 +0000 (11:11 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 4 Sep 2013 09:11:28 +0000 (11:11 +0200)
1  2 
portal/templates/my_account.html

Simple merge