projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8714feb 69b86cf)
Merge branch 'master' of github.com:schmonz/ikiwiki
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 3 Aug 2013 14:44:33 +0000 (10:44 -0400)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 3 Aug 2013 14:44:33 +0000 (10:44 -0400)

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