git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88dadc3 f565154)
Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:26:14 +0000 (10:26 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 12 Dec 2012 09:26:14 +0000 (10:26 +0100)
1  2 
sfa/client/sfi.py patch | diff1 | diff2 | blob | history
sfa/managers/registry_manager.py patch | diff1 | diff2 | blob | history

diff --cc sfa/client/sfi.py
Simple merge
diff --cc sfa/managers/registry_manager.py
Simple merge
sfa