events
This commit is contained in:
commit
ed502ff510
12
content/datenspuren/fahrplan.xml
Normal file
12
content/datenspuren/fahrplan.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
|
||||
|
||||
<page pagetitle="Datenspuren 2015" title="Datenspuren">
|
||||
<p>
|
||||
<!--
|
||||
- freitag: social event
|
||||
- samstag: talks und abends party im TSD cafe
|
||||
- sonntag: talks
|
||||
-->
|
||||
</p>
|
||||
</page>
|
|
@ -2665,11 +2665,14 @@
|
|||
<end>2015-04-20T21:00:00</end>
|
||||
<link>http://webmontag.de/location/dresden/index</link>
|
||||
</event>
|
||||
<<<<<<< HEAD
|
||||
<event title="Freie Software und Freies Wissen">
|
||||
<start>2015-04-22T18:30:00</start>
|
||||
<location>SLUB Zentralbibliothek, Raum -2.115</location>
|
||||
<link>http://fsfw-dresden.de/</link>
|
||||
</event>
|
||||
=======
|
||||
>>>>>>> 64aa5c00c3d3721f2ea51bd1a1c43be35580bc1c
|
||||
<event title="Pentaradio">
|
||||
<start>2015-04-28T21:30:00</start>
|
||||
<end>2015-04-28T23:00:00</end>
|
||||
|
@ -2799,4 +2802,14 @@
|
|||
<location>Wikimedia, Berlin</location>
|
||||
<link>https://sourcecode.berlin/enthusiasticon/</link>
|
||||
</event>
|
||||
<event title="7. Organisationstreffen für die Datenspuren 2015">
|
||||
<start>2015-04-21T20:00:00</start>
|
||||
<location>GCHQ, Lingnerallee 3, Dresden</location>
|
||||
<link>https://pentapad.c3d2.de/p/ds15-7</link>
|
||||
</event>
|
||||
<event title="Das digitale Wir">
|
||||
<start>2015-04-24T19:30:00</start>
|
||||
<location>Hygiene-Museum Dresden</location>
|
||||
<link>http://dhmd.de/index.php?id=2517</link>
|
||||
</event>
|
||||
</calendar>
|
||||
|
|
Loading…
Reference in New Issue
Block a user