Merge branch 'master' of ralphtheninja/website into master

2016^2
gorhgorh 9 years ago committed by Gogs
commit 6e0368e3d0

@ -47,4 +47,4 @@ if you tell before so that we have an idea on how many people need accomodation.
## I want to give a talk!
Please see [our talks repository](https://git.cryto.net/Squatconf/Talks/pulls) to propose a talk.
Please see [our talks repository](https://git.cryto.net/Squatconf/Talks) to propose a talk.

Loading…
Cancel
Save