Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 2 Aug 2013 08:07:56 +0000 (10:07 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 2 Aug 2013 08:07:56 +0000 (10:07 +0200)
commit302dd5bda1297ed6579ca26da35ee67f8d35d934
tree5a2f57a09825b0a23fc840393d96729b2ca26f3c
parent3a4e8104cf076bbbfb5219424f08629a295c4ccd
parentc30560b1f453262ef7f4e3d27a76fbd4aefba7a0
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
portal/views.py