Changed Presenting
Changed Presenting
Changed Presenting
Merge branch 'master' of github.com:ccchh/Cryptoparty-Slides
Merge branch 'master' of github.com:ccchh/Cryptoparty-Slides
Added pic, changed socket.io
smaller pic
Emailverschlüsselung wieder korrekt gegliedert
Merge branch 'master' of github.com:ccchh/Cryptoparty-Slides
Merge branch 'master' of git.chaos.li:cphh/cphh_slides
Added line-break in first slide"
fixed first slide
Link auf Slides korrigiert
neue Reihenfolge: Email->FDE->Chat
Typo in Slides-URL gefixt