projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
514dd6f
24a0b84
)
Merge branch 'identity_abe' into identity_oidc
author
Schanzenbach, Martin
<martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:39:55 +0000
(17:39 +0100)
committer
Schanzenbach, Martin
<martin.schanzenbach@aisec.fraunhofer.de>
Mon, 4 Dec 2017 16:39:55 +0000
(17:39 +0100)
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