Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 13:46:28 +0000 (10:46 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 13:46:28 +0000 (10:46 -0300)
commit26abe984a66291a2feca1dbf8053696ed710d995
treeb81627f5e7956491b42d945d8b4fec1f45731bb3
parenta7c93f79d9aea586895221b73dd5fd18309354c2
parent507aaa799377f1f5838bd8b8de19c4aef90e0ddc
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py
manifoldapi/static/js/manifold.js
portal/static/css/fibre.css