Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 10:57:01 +0000 (12:57 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 5 Sep 2013 10:57:01 +0000 (12:57 +0200)
commitfd94e2aa074f084afdecf26f023c8e369fec6605
tree403c487779a65e05a79fa32d938d9ada53509992
parent9eb4ac576c598dd28b0d8622ba83dc758e123ef8
parente5ff99987b62d202bc453cddb8e7dc4a218ac64f
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py