Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 7 Aug 2014 19:03:29 +0000 (16:03 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 7 Aug 2014 19:03:29 +0000 (16:03 -0300)
commit2a446c0475392bcf26121e3f187fd327190c0a1a
tree447ac24636b803facefbe814bb8ce1b3598c88e4
parentd750d30e7c0fbb972f1a6cd8d1a5ffe1dad837d0
parentce9d7fe0417a2085c0e525f6f1f03a96fc42fc07
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/templates/fibre/fibre_registration_view.html
portal/templates/fibre/fibre_user_register_complete.html