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)
commit8c8f04ea43ed69b7a81c90f456b1153a4167a72f
treeb98a92aa0e9eab15af807ba17bf74e0a2e030c34
parentc15eb339cc9b7955f77b7cbb6e3466e0ce49b7e4
parent8c048c3b87dea41a4ad76da653e7623591251c87
Fix merge conflict: MyAccount
portal/templates/my_account.html