Merge branch 'master' of git://git.onelab.eu/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:16:07 +0000 (12:16 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:16:07 +0000 (12:16 +0200)
commit15ca59cb1f80be244df33026add2cf97f2f87a62
tree17a3cb93eafb21afdfc68948b87a1f494dd033a8
parent2f4f816b579ec2fd97dff5a318fe638ed26ebf3c
parent2b1211c766c56a7b962d8b82c8f638825b6166cb
Merge branch 'master' of git://git.onelab.eu/myslice

Conflicts:
portal/registrationview.py
portal/sliceview.py
portal/templates/registration_view.html