Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 12:55:47 +0000 (13:55 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 12:55:47 +0000 (13:55 +0100)
commitd251934bd71c678f552dc9a1d49c3f8efe102e1e
tree135cdfdcdf88f8ed0e257ddafddceb0e4e44d237
parentce50fd212455344e184297c3eb448268608559fe
parent325f6fccac2c4834031e09f92d67cef59256a335
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/registrationview.py
portal/actions.py
portal/dashboardview.py
portal/registrationview.py
portal/templates/onelab/onelab_home-view.html