]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ff7d4b 9485bd1)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 14 Mar 2015 19:57:53 +0000 (15:57 -0400)

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