git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cee3191 2d8a644)
Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
authorLoic Baron <loic.baron@lip6.fr>
Thu, 9 Feb 2017 02:24:33 +0000 (03:24 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 9 Feb 2017 02:24:33 +0000 (03:24 +0100)
1  2 
sfa/trust/hierarchy.py patch | diff1 | diff2 | blob | history

diff --cc sfa/trust/hierarchy.py
Simple merge
sfa