]> 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: 7e1b8c4 2a143bf)
Merge remote-tracking branch 'anarcat/dev/syslog_utf8'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:09:51 +0000 (14:09 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:09:51 +0000 (14:09 -0400)
1  2 
IkiWiki.pm patch | diff1 | diff2 | blob | history

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