projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0341d0 7562350)
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 21:34:10 +0000 (21:34 +0000)
committerSimon McVittie <smcv@debian.org>
Thu, 29 Dec 2016 21:34:10 +0000 (21:34 +0000)

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