git.bettercrypto.org / ach-master.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13d051b 4e65d65)
Merge branch 'master' of github.com:BetterCrypto/Applied-Crypto-Hardening
authorAaron Kaplan <aaron@lo-res.org>
Sun, 29 Mar 2015 19:45:08 +0000 (21:45 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Sun, 29 Mar 2015 19:45:08 +0000 (21:45 +0200)
1  2 
presentations/org-training/agenda.md patch | diff1 | diff2 | blob | history

diff --cc presentations/org-training/agenda.md
Simple merge
applied crypto hardening (master repo)