Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 13 Aug 2013 16:09:54 +0000 (18:09 +0200)
commit6abb2ca187f04e30071da29386552f3ce670b5dc
treec299cfa1cfa3c6d38e38e8204f3f1532de8ae591
parent90cfd378e8bec3397b3c0c9171d8e7cac7589700
parentf1ab05190b0624b8e6fa5d6b960c4ffdc6da37a8
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py