Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Feb 2014 15:43:33 +0000 (16:43 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 25 Feb 2014 15:43:33 +0000 (16:43 +0100)
commitda0b290c0d86afe3d388f4b1a8be60a70b39ed92
tree8e8df0d7aead770fee2df7d80aa20623e6040c37
parent8cd242571082562afa089d7da255c8234055f685
parentb9ee6272b7dcc1a07fd14278328fafc24ee57f43
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/registrationview.py
portal/slicerequestview.py