sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5b8c5c be3483f)
Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:19:39 +0000 (14:19 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:19:39 +0000 (14:19 -0400)
1  2 
IkiWiki/Plugin/git.pm patch | diff1 | diff2 | blob | history

diff --cc IkiWiki/Plugin/git.pm
Simple merge
wiki compiler