Commit graph

8 commits

Author SHA1 Message Date
gorhgorh 2212af95dd added peergos talk 2016-04-21 21:28:54 +02:00
gorhgorh 4de6de02c7 apathy and my pet project talk 2016-04-17 23:02:20 +02:00
gorhgorh a82bc83469 first round of accepted talks 2016-04-17 22:36:02 +02:00
Jérôme Loï 22061b2870 Updated confirmed talks 2014-10-27 13:28:14 +01:00
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
2014-10-26 23:39:20 +01:00
Jérôme Loï b48404a964 update accepted talks 2014-10-26 23:38:49 +01:00
joates 483c05a39f fruit 2014-10-17 20:46:05 +01:00
joates eff7a3d3b8 vegetables 2014-10-17 20:45:47 +01:00