projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
514dd6f
b16fa2d
)
Merge remote-tracking branch 'origin/identity_abe' into identity_oidc
author
Phil
<phil.buschmann@tum.de>
Mon, 4 Dec 2017 15:19:45 +0000
(15:19 +0000)
committer
Phil
<phil.buschmann@tum.de>
Mon, 4 Dec 2017 15:19:45 +0000
(15:19 +0000)
1
2
src/identity-provider/plugin_rest_identity_provider.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/identity-provider/plugin_rest_identity_provider.c
Simple merge