Merge branch 'master' of ssh://webmasters.boum.org/~/wiki

8b45e31c · Tails developers · 7827126d · 8fe78d16 · 8b45e31c
Commit 8b45e31c authored Jun 28, 2014 by Tails developers
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

wiki/src/blueprint/HackFest_2014_Paris.mdwn wiki/src/blueprint/HackFest_2014_Paris.mdwn +2 -0

No files found.
--- a/wiki/src/blueprint/HackFest_2014_Paris.mdwn
+++ b/wiki/src/blueprint/HackFest_2014_Paris.mdwn
@@ -63,6 +63,8 @@ Talks

 * **Introductory talk**

+* **Resisting total surveillance**, by Richard Stallman
+
 * **Triaging Tails tickets**, by BitingBird: an easy way to start contributing and learn what are the plans

 * **Enforcing Anonymity and Improving Pseudonymity in Tails**, by