22 Commits (1f2adc4f6e09940bf70fabf7398b390667215423)

Author SHA1 Message Date
gorhgorh 1f2adc4f6e Merge branch 'master' of http://git.cryto.net/Squatconf/Talks 9 years ago
gorhgorh 42c38b498f fixing typo 9 years ago
Marina Kukso 655c50f963 notes from my talk 9 years ago
hoegrammer 8cc1adf995 Changed my talk 9 years ago
gorhgorh 3e8a3bd444 moved federated to day one 9 years ago
gorhgorh e77e36ab5f update talks 9 years ago
gorhgorh 4b1f5d7b94 :( 9 years ago
gorhgorh 48e70a8c1c update talks 9 years ago
gorhgorh f91a2e672f talks update 9 years ago
gorhgorh ca0eb45071 start split talks days 9 years ago
gorhgorh d9a3379820 added wa7son's talk 9 years ago
gorhgorh d081d478a9 cleanup and update 9 years ago
gorhgorh ca46b96661 added unix & holistic technologies 9 years ago
holger krekel 5230cda30a second round of accepted talks 9 years ago
gorhgorh 2212af95dd added peergos talk 9 years ago
gorhgorh 4de6de02c7 apathy and my pet project talk 9 years ago
gorhgorh a82bc83469 first round of accepted talks 9 years ago
Jérôme Loï 22061b2870 Updated confirmed talks 10 years ago
Jérôme Loï f345a00aff Merge branch 'master' of https://github.com/squatconf/talks
# By holger krekel (2) and others
# Via gorhgorh (3) and Dominic Tarr (2)
* 'master' of https://github.com/squatconf/talks:
  actually add some content to my proposal
  add LEAP talk proposal
  some refinements
  added my talk
  Added edgenet proposal
10 years ago
Jérôme Loï b48404a964 update accepted talks 10 years ago
joates 483c05a39f fruit 10 years ago
joates eff7a3d3b8 vegetables 10 years ago