Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 29 Jul 2013 15:15:19 +0000 (17:15 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 29 Jul 2013 15:15:19 +0000 (17:15 +0200)
commitd9fa97447cdfd1fc896d840f7b3bebbb3d2bd921
tree8d0a76fbd6e93dd958a10b1dde7978273f80068c
parent99a0fe1c929e2934795fb53d0d45de7f2e49cff1
parentf89424cffcb881206feeb0506705c470d4a73092
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py