projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 389f493 1ad7b69)
Merge branch 'gsoc2018/rest_api'
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 9 Aug 2018 21:57:14 +0000 (23:57 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 9 Aug 2018 21:57:14 +0000 (23:57 +0200)

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