Browse Source

added adress to the ws

pull/2/head
gorhgorh 5 years ago
parent
commit
29bf42ce2a
  1. 28
      src/header.md
  2. 8
      src/index.hbs

28
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).
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)

8
src/index.hbs

@ -26,6 +26,14 @@
</a>
</div>
</fieldset>
<fieldset>
<legend>Venue</legend>
<div>
<a href="https://www.openstreetmap.org/node/2688963276" target="_blank">
<button type="submit" class="btn">Spektrum Berlin</button>
</a>
</div>
</fieldset>
</div>
<br />

Loading…
Cancel
Save