Merge branch 'master' of git.c3d2.de:c3d2-web

This commit is contained in:
koeart 2016-01-13 19:57:22 +01:00
commit a6a65a2455

View File

@ -3744,5 +3744,15 @@
<location>Guildford, Surrey, UK</location>
<link>https://www.emfcamp.org/</link>
</event>
<event title="DresdenJS">
<start>2016-01-14T19:00:00</start>
<location>Nikkifaktur, Lößnitzstraße 14 in 01097 Dresden</location>
<link>http://dresdenjs.io/</link>
</event>
<event title="Open Silicon">
<start>2016-01-16T20:30:00</start>
<location><link href="http://www.c3d2.de/space.html">GCHQ</link>, Lingnerallee 3, 01069 Dresden</location>
<mailto>norbert@c3d2.de</mailto>
</event>
</calendar>