Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 18:28:33 +0000 (15:28 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 18:28:33 +0000 (15:28 -0300)
commitcf1ad1657f1f831953a496c502d9d3c1e89fac15
treef17d5ade0b677c2c839d55f185adbc7996a4b4bb
parent26abe984a66291a2feca1dbf8053696ed710d995
parent6891e1820029861f4b618723ff10f4aeefeda80e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
manifoldapi/static/js/manifold.js