projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9671284 4dc95a5)
Merge branch 'master' into schanzen/reclaim_256bit schanzen/reclaim_256bit
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 13 Feb 2020 14:15:34 +0000 (15:15 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 13 Feb 2020 14:15:34 +0000 (15:15 +0100)

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