projects
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[.git]
/
EDRi___38___EuroDIG_social_event.mdwn
diff --git
a/EDRi___38___EuroDIG_social_event.mdwn
b/EDRi___38___EuroDIG_social_event.mdwn
index
c326ac1
..
9ccb9c4
100644
(file)
--- a/
EDRi___38___EuroDIG_social_event.mdwn
+++ b/
EDRi___38___EuroDIG_social_event.mdwn
@@
-1,3
+1,5
@@
+# http://bit.ly/teT2uo
+
# EDRi = European Digital Rights
[http://www.edri.org](http://www.edri.org)
# EDRi = European Digital Rights
[http://www.edri.org](http://www.edri.org)
@@
-8,7
+10,7
@@
* Lots of useful information materials -- translate to your language and let EDRi know
* [Blocking booklet](http://www.edri.org/internet-blocking-brochure)
* [ACTA booklet ](http://www.edri.org/files/acta-bklt-p2s.pdf)
* Lots of useful information materials -- translate to your language and let EDRi know
* [Blocking booklet](http://www.edri.org/internet-blocking-brochure)
* [ACTA booklet ](http://www.edri.org/files/acta-bklt-p2s.pdf)
- * [The slide from "Self-regulation" to c
r
orporate censorship](http://www.edri.org/files/EDRI_selfreg_final_20110124.pdf)
+ * [The slide from "Self-regulation" to corporate censorship](http://www.edri.org/files/EDRI_selfreg_final_20110124.pdf)
* [Under Surveillance comic](http://www.edri.org/campaigns/comic-book-under-surveillance)
# EuroDIG = European Dialogue on Internet Governance
* [Under Surveillance comic](http://www.edri.org/campaigns/comic-book-under-surveillance)
# EuroDIG = European Dialogue on Internet Governance
@@
-16,8
+18,11
@@
[http://www.eurodig.org/](http://www.eurodig.org/)
* In Stockholm, June 14-15, 2012
[http://www.eurodig.org/](http://www.eurodig.org/)
* In Stockholm, June 14-15, 2012
+* Interested in doing something together?
* Deadline for proposals: end of November 2011
* Deadline for proposals: end of November 2011
- *
(Etherpad for ideas)[http://muistio.tieke.fi/NubaPydgvU]
+ *
[Etherpad for ideas](http://muistio.tieke.fi/NubaPydgvU)
Feedback, ideas, questions, whatever? Talk to me now, or mail me, Leena Romppainen, <leena.romppainen@effi.org>
Feedback, ideas, questions, whatever? Talk to me now, or mail me, Leena Romppainen, <leena.romppainen@effi.org>
+
+[[big]]