pradapony/varia.website
1
0
Fork 0
forked from varia/varia.website
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://vvvvvvaria.org:12345/varia/varia.website

Browse Source
This commit is contained in:
mb@mb 2018-02-01 20:39:17 +01:00
commit aa5b18e691
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/ccc-screening.en.md
View File

@ -14,7 +14,7 @@ For those that didn't make it to Leipzig this year we're gathering to watch the
* Friday 29th: 11:30h - late
* Saturday 30th: 11:30h - 18:15h
Bring your own beer and add your whishes to [the list of talks](https://pad.vvvvvvaria.org/34c3), we only have one projector and make the livestream programme on the spot!
Bring your own beer and add your whishes to the list of talks[ref][https://pad.vvvvvvaria.org/34c3](https://pad.vvvvvvaria.org/34c3)[/ref], we only have one projector and make the livestream programme on the spot!
Download the CCC progam: [fahrplan (PDF)](https://events.ccc.de/congress/2017/Fahrplan/)
Download the CCC progam[ref][fahrplan (PDF)](https://events.ccc.de/congress/2017/Fahrplan/)[/ref]

2
content/ccc-screening.nl.md
View File

@ -16,5 +16,5 @@ Voor hen die de tocht naar Leipzig dit jaar niet gaan maken organiseren we een 3
Neem je eigen eten en drinken mee en [vul het lijstje aan van](https://pad.vvvvvvaria.org/34c3) van talks die we niet kunnen missen, we hebben maar één projector dus we maken het livestream programme ter plekke.
Download het CCC progamma: [fahrplan (PDF)](https://events.ccc.de/congress/2017/Fahrplan/)
Download het CCC progamma[ref][fahrplan (PDF)](https://events.ccc.de/congress/2017/Fahrplan/)[/ref]

1
content/social-media-next-steps.md
View File

@ -3,6 +3,7 @@ Category: longread
Slug: sm-critique-next-steps
lang: en
author: Roel Roscam Abbing
status:draft
Recently there was a discussion thread on [Nettime](https://nettime.org/Lists-Archives/nettime-l-1801/msg00045.html) on what the next steps for social media critique could be. Since the discussion missed some context on recent developments from the non-GAFA [ref]Google/Amazon/Facebook/Apple[/ref]/Free Software developments in this field media I've replied with some comments.