]> 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: 4a108fa 69525cf)
Merge branch 'master' into fancypodcast
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 12 May 2013 23:16:50 +0000 (19:16 -0400)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 12 May 2013 23:16:50 +0000 (19:16 -0400)
1  2 
IkiWiki/Plugin/meta.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/meta.pm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.