From: Loic Baron Date: Thu, 24 Jul 2014 18:28:33 +0000 (-0300) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cf1ad1657f1f831953a496c502d9d3c1e89fac15;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre Conflicts: manifoldapi/static/js/manifold.js --- cf1ad1657f1f831953a496c502d9d3c1e89fac15