Squatconf/Website
2
1
Fork 2
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of realitygaps/Website into master

Browse source
This commit is contained in:
realitygaps 2016-04-29 11:34:09 -04:00 committed by Gogs
parent 29bf42ce2a c89abcaa92
commit f99e18bb9d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/header.md
View file

@ -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)