git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e558be
a89ccd8
)
Merge branch 'geni-v3' of git://git.onelab.eu/sfa into geni-v3
author
Loic Baron
<loic.baron@lip6.fr>
Fri, 10 Feb 2017 02:58:20 +0000
(
03:58
+0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Fri, 10 Feb 2017 02:58:20 +0000
(
03:58
+0100)
1
2
sfa/trust/hierarchy.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sfa/trust/hierarchy.py
Simple merge