projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8a1a08 98288a7)
Merge branch 'master' of gnunet.org:gnunet
authorNils Gillmann <ng0@n0.is>
Tue, 13 Nov 2018 11:42:15 +0000 (11:42 +0000)
committerNils Gillmann <ng0@n0.is>
Tue, 13 Nov 2018 11:42:15 +0000 (11:42 +0000)
1  2 
src/util/configuration.c patch | diff1 | diff2 | blob | history

diff --cc src/util/configuration.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.