]> 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: dd76222 7ef44d8)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 14:46:59 +0000 (10:46 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 14:46:59 +0000 (10:46 -0400)
1  2 
doc/todo/emailauth.mdwn patch | diff1 | diff2 | blob | history

diff --cc doc/todo/emailauth.mdwn
Simple merge
Unnamed repository; edit this file 'description' to name the repository.