Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 25 Jul 2013 14:16:22 +0000 (16:16 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Thu, 25 Jul 2013 14:16:22 +0000 (16:16 +0200)
commit7b1bc5bd58de4f06a193f3dd344df7b342504cbf
treef627291656791c1f8dcba3555b3223e52076e221
parent2f4e3e456c0f10f3316c9eafb09cc95bbd4a3043
parentf7dabf619b72ce2c915174401adbbb85891f41d6
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py