projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d9d61a5 4378541)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 3 Jun 2016 05:37:01 +0000 (01:37 -0400)

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