From 29bf42ce2a926894fba478f19b41f52bb329681f Mon Sep 17 00:00:00 2001 From: gorhgorh Date: Fri, 29 Apr 2016 07:46:19 +0200 Subject: [PATCH] added adress to the ws --- src/header.md | 28 ++++++++++++++++++++++++---- src/index.hbs | 8 ++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/header.md b/src/header.md index 64df4f3..af4ddfa 100644 --- a/src/header.md +++ b/src/header.md @@ -1,8 +1,28 @@ # Berlin, 29-30 april 2016 -## Schedule update +## Venue - -We planned to have all talks on day two (30/04), but we had so many good proposal that we can not fit them all in one day, some of them will be moved in day one (29/04) afternoon. +[Spektrum Berlin](https://www.openstreetmap.org/node/2688963276) -We will update schedule accordingly come back here to look for updates and check the (temporary) ["schedule"](https://pad.ijhack.nl/p/squatconf-days). \ No newline at end of file +Bürknerstraße 12 12047 Berlin + +[http://spektrumberlin.de/home.html](http://spektrumberlin.de/home.html) + + +## Day one schedule + +Morning (9-13) +Decentralized networking sessions + +Lunch pause (13 - 14) + +Afternoon (14 - 18) +Talks (order not defined yet) + +[peergos](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/peergos.md) +[Anarchitecture](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/anarchitecture.md) +[PC20](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/pc20.md) + +[Federated Wiki intro](https://git.cryto.net/Squatconf/Talks/src/master/accepted/day1/federated.md) + workshop + +[mayday demonstrations 101](https://pad.ijhack.nl/p/squatconf-workshops) diff --git a/src/index.hbs b/src/index.hbs index 6fb6a5b..438715b 100644 --- a/src/index.hbs +++ b/src/index.hbs @@ -26,6 +26,14 @@ +
+ Venue +
+ + + +
+