Merge branch 'master' of realitygaps/Website into master

master
realitygaps 9 years ago committed by Gogs
commit f99e18bb9d

@ -25,4 +25,8 @@ Talks (order not defined yet)
[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)
[mayday demonstrations 101](https://pad.ijhack.nl/p/squatconf-workshops)
## Day 2 Schedule (Saturday 30th)
[pad for (almost) finalised schedule](https://pad.ijhack.nl/p/squatconf-schedule)

Loading…
Cancel
Save