From dcec68a3a27c3ceee0ccce8538ea786945bec41c Mon Sep 17 00:00:00 2001 From: gorhgorh Date: Tue, 29 Mar 2016 00:41:04 +0200 Subject: [PATCH] corrected repo url --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 840a719..f310c40 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ ## What is SquatConf? It started in Paris Nov 2014 ... Squatconf happened in November 2014 in Paris in a squat, hence the name. -It wasn't your typical IT conference because it was mostly Just-in-Time-organized +It wasn't your typical IT conference because it was mostly Just-in-Time-organized by all the people who attend. There were no advertisements from Silicon Valley companies (or any others) and several people felt free to give somewhat radical talks on technologies and society, even openly associate with anarchism. There also were a fair share of advanced tech talks on web Crypto, decentralized tech demos, internet of things, automatic garden -planting systems and what not. And we had many personal conversations +planting systems and what not. And we had many personal conversations among each other which continue to this day. ## ... and now we go to Berlin end april 2016! We want to make another Squatconf happening happen around end April 2016 in Berlin. Timing wise it's next to "re:publica" so that -researchers and others who are going to this business conference can also +researchers and others who are going to this business conference can also drop by at squatconf to participate in a more independent event. Berlin has gotten quite trendy, more expensive and squatting is much less happening than it used to. But there still is lots of life @@ -47,5 +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://github.com/squatconf/talks) to propose a talk. - +Please see [our talks repository](https://git.cryto.net/Squatconf/Talks/pulls) to propose a talk.