projects / monkeysphere.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4e17a8 5a18c46)
Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
1  2 
website/doc.mdwn patch | diff1 | diff2 | blob | history
website/local.css patch | diff1 | diff2 | blob | history

diff --cc website/doc.mdwn
Simple merge
diff --cc website/local.css
Simple merge
Public key validation through the PGP Web of Trust.