diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-13 11:33:42 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-13 11:33:42 -0300 |
| commit | 65c88cf4770dff781249f6d5b470c01a9a0c6d04 (patch) | |
| tree | c21fefcecc5e6a3858eb9155753b2ada42939daa /fisl.mdwn | |
| parent | 745cd614e263f6c94fa628e86fc3f330faf6ae6a (diff) | |
| parent | 5e0d09354cfc1f66390719dc29dca5ddba08224a (diff) | |
| download | blog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.gz blog-65c88cf4770dff781249f6d5b470c01a9a0c6d04.tar.bz2 | |
Merge branch 'master' into develop
Diffstat (limited to 'fisl.mdwn')
| -rw-r--r-- | fisl.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,8 +1,9 @@ -# A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle +[[!meta title="A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle"]] -* FISL16 - 2015 +* FISL16 - 10/07/2015 * rhatto.sarava.org/fisl / rhatto @ sarava.org * `66CA 01CE 2BF2 C9B7 E8D6 4E34 0546 8239 64E3 9FCA` +* [Slides](slides.pdf). # Distopia |