projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02c92c6 cf64973)
Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 19 Aug 2017 00:58:03 +0000 (09:58 +0900)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 19 Aug 2017 00:58:03 +0000 (09:58 +0900)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.