Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 9 Mar 2015 18:53:49 +0000 (19:53 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 9 Mar 2015 18:53:49 +0000 (19:53 +0100)
commit111d0fcb9681bf94ff184fe43bf636b6d672cbff
tree92ef3a0933fd1c9a6a945b5abe31267ceb6a09f0
parentf8bf9fe459d94a73dff2c1f4fdcda88ac5031a95
parentbc5fef422b84dae845615fad065ece5ef450e01c
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/joinview.py
portal/registrationview.py
myslice/settings.py
portal/registrationview.py
portal/slicetabexperiment.py