Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 8 Jan 2016 11:16:57 +0000 (12:16 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 8 Jan 2016 11:16:57 +0000 (12:16 +0100)
1  2 
rest/sfa_api.py

diff --cc rest/sfa_api.py
Simple merge