Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 9 Nov 2015 17:49:28 +0000 (18:49 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 9 Nov 2015 17:49:28 +0000 (18:49 +0100)
commitddcdaf8d61df7f4a2a0da11c23190b56ed914464
treec68be720daceaf7efd9763ea0a9c406713fa497a
parent9fb4e38d727d9f6d3e1fbc60742a5ee433d7d3b6
parent679cd0a1550f31b85c1cd4ca384cb320b32875c8
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
rest/sfa_api.py
rest/sfa_api.py