projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab28159 1c2ab4a)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 21 Apr 2017 11:36:41 +0000 (13:36 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 21 Apr 2017 11:36:41 +0000 (13:36 +0200)
1  2 
po/POTFILES.in patch | diff1 | diff2 | blob | history

diff --cc po/POTFILES.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.