Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 18:31:50 +0000 (15:31 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 18:31:50 +0000 (15:31 -0300)
commit6891134719af440a27636545c3babfcb5ccf3d5c
tree39f341f8bf97a1d620ceaafbae5f9c2769764f6c
parentcf1ad1657f1f831953a496c502d9d3c1e89fac15
parent7e8b243ba01f6ee786c44cf71a01963f936f67ea
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py
portal/actions.py
portal/registrationview.py
portal/slicerequestview.py
portal/templates/base.html