Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 6 Aug 2013 15:36:39 +0000 (17:36 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 6 Aug 2013 15:36:39 +0000 (17:36 +0200)
commit05861f44a20edf11bacba3d0d6fad3dee9ad7957
tree0d2f7b004c6a5ab6ffe5e8ca59a9a7ab7247b6a6
parent32c8b3cf9421ee4d260162913cc6ab2dadaaea8c
parentf32b4c0960cdeba72c6023b54464d1e70e0534fb
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py