ds20 fahrplan v999
This commit is contained in:
commit
c9ebd77963
|
@ -1,80 +0,0 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Datenspuren 2020 – Credits</title>
|
||||
<link rel="stylesheet" href="assets/css/ds20.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<main>
|
||||
<div class="important">
|
||||
<h1>Credits</h1>
|
||||
<ul>
|
||||
<li>Danke an <a href="https://www.peax-webdesign.com/polices-de-caracteres-gratuites.html">Peax Webdesign</a> für den Font Cheveux d'ange</li>
|
||||
</ul>
|
||||
<p>
|
||||
Zurück zur <a href="https://datenspuren.de/2020/">Hauptseite</a>
|
||||
</p>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<footer>
|
||||
<ul id="oldds">
|
||||
<li>
|
||||
<a href="../2004/">2004</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2005/">2005</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2006/">2006</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2007/">2007</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2008/">2008</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2009/">2009</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2010/">2010</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2011/">2011</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2012/">2012</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2013/">2013</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2014/">2014</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2015/">2015</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2016/">2016</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2017/">2017</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2018/">2018</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="../2019/">2019</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div>
|
||||
<a href="http://www.c3d2.de/">Chaos Computer Club Dresden</a> ♥
|
||||
<a href="mailto:datenspuren@c3d2.de" title="Mail">datenspuren@c3d2.de</a>
|
||||
</div>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
|
@ -534,7 +534,11 @@ Vortrag
|
|||
<h2><a href="/2020/fahrplan/events/11334.html">minetest4kids</a></h2>
|
||||
<div class="label">
|
||||
<span class="track-unterhaltung">
|
||||
<<<<<<< HEAD
|
||||
Workshop 1
|
||||
=======
|
||||
Workshop 2
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
(de)
|
||||
</span>
|
||||
</div>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -59,7 +59,11 @@ Sonntag
|
|||
|
||||
</div>
|
||||
<div id="main-content">
|
||||
<<<<<<< HEAD
|
||||
<p class="release">Version 0.999</p>
|
||||
=======
|
||||
<p class="release">Version 0.99</p>
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
<h2>Workshop: minetest4kids</h2>
|
||||
<h3 class="title"></h3>
|
||||
<div class="column left" id="basic">
|
||||
|
@ -80,7 +84,11 @@ Sonntag
|
|||
05:00
|
||||
<br>
|
||||
<b>Raum:</b>
|
||||
<<<<<<< HEAD
|
||||
Workshop 1
|
||||
=======
|
||||
Workshop 2
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
<br>
|
||||
<b>Track:</b>
|
||||
<a href="/2020/fahrplan/events.html#unterhaltung">Unterhaltung</a>
|
||||
|
@ -112,7 +120,11 @@ de
|
|||
"name" : "minetest4kids",
|
||||
"location" : {
|
||||
"@type" : "Place",
|
||||
<<<<<<< HEAD
|
||||
"name" : "Workshop 1",
|
||||
=======
|
||||
"name" : "Workshop 2",
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
"address" : "Datenspuren 2020"
|
||||
},
|
||||
"startDate" : "2020-09-20T11:00:00+0200",
|
||||
|
|
|
@ -15,12 +15,20 @@ END:VTIMEZONE
|
|||
BEGIN:VEVENT
|
||||
DTEND;TZID=Europe/Berlin;VALUE=DATE-TIME:20200920T160000
|
||||
DTSTART;TZID=Europe/Berlin;VALUE=DATE-TIME:20200920T110000
|
||||
<<<<<<< HEAD
|
||||
DTSTAMP;VALUE=DATE-TIME:20200919T164905Z
|
||||
=======
|
||||
DTSTAMP;VALUE=DATE-TIME:20200919T161410Z
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
UID:b16c3b45-21cc-4a94-bb7b-95087ce2393f@frab.cccv.de
|
||||
DESCRIPTION:
|
||||
URL:https://datenspuren.de/2020/fahrplan/events/11334.html
|
||||
SUMMARY:minetest4kids
|
||||
ORGANIZER:ds20
|
||||
<<<<<<< HEAD
|
||||
LOCATION:ds20 - Workshop 1
|
||||
=======
|
||||
LOCATION:ds20 - Workshop 2
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
END:VEVENT
|
||||
END:VCALENDAR
|
||||
|
|
|
@ -303,11 +303,19 @@ END:VEVENT
|
|||
BEGIN:VEVENT
|
||||
DTEND;TZID=Europe/Berlin;VALUE=DATE-TIME:20200920T160000
|
||||
DTSTART;TZID=Europe/Berlin;VALUE=DATE-TIME:20200920T110000
|
||||
<<<<<<< HEAD
|
||||
DTSTAMP;VALUE=DATE-TIME:20200919T164905Z
|
||||
=======
|
||||
DTSTAMP;VALUE=DATE-TIME:20200919T161410Z
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
UID:b16c3b45-21cc-4a94-bb7b-95087ce2393f@frab.cccv.de
|
||||
DESCRIPTION:
|
||||
URL:https://datenspuren.de/2020/fahrplan/events/11334.html
|
||||
SUMMARY:minetest4kids -
|
||||
<<<<<<< HEAD
|
||||
LOCATION:Workshop 1
|
||||
=======
|
||||
LOCATION:Workshop 2
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
END:VEVENT
|
||||
END:VCALENDAR
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -482,7 +482,11 @@ Ein micro:Gerät soll hier Abhilfe schaffen.
|
|||
<status>CONFIRMED</status>
|
||||
<category>Lecture</category>
|
||||
<url>https://datenspuren.de/2020/fahrplan/events/11334.html</url>
|
||||
<<<<<<< HEAD
|
||||
<location>Workshop 1</location>
|
||||
=======
|
||||
<location>Workshop 2</location>
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
</vevent>
|
||||
</vcalendar>
|
||||
</iCalendar>
|
||||
|
|
|
@ -777,5 +777,36 @@ Beim Prototype Fund werden jedes Jahr zwei Kohorten betreut, deren gemeinwohlori
|
|||
</attachments>
|
||||
</event>
|
||||
</room>
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<room name='Workshop 2'>
|
||||
<event guid='b16c3b45-21cc-4a94-bb7b-95087ce2393f' id='11334'>
|
||||
<date>2020-09-20T11:00:00+02:00</date>
|
||||
<start>11:00</start>
|
||||
<duration>05:00</duration>
|
||||
<room>Workshop 2</room>
|
||||
<slug>ds20-11334-minetest4kids</slug>
|
||||
<url>https://datenspuren.de/2020/fahrplan/events/11334.html</url>
|
||||
<recording>
|
||||
<license></license>
|
||||
<optout>false</optout>
|
||||
</recording>
|
||||
<title>minetest4kids</title>
|
||||
<subtitle></subtitle>
|
||||
<track>Unterhaltung</track>
|
||||
<type>workshop</type>
|
||||
<language>de</language>
|
||||
<abstract></abstract>
|
||||
<description></description>
|
||||
<logo></logo>
|
||||
<persons>
|
||||
</persons>
|
||||
<links>
|
||||
</links>
|
||||
<attachments>
|
||||
</attachments>
|
||||
</event>
|
||||
</room>
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
</day>
|
||||
</schedule>
|
||||
|
|
|
@ -1046,7 +1046,11 @@ endobj
|
|||
endobj
|
||||
6 0 obj
|
||||
<< /Type /Font
|
||||
<<<<<<< HEAD
|
||||
/BaseFont /AAAABO+BitstreamVeraSans-Roman
|
||||
=======
|
||||
/BaseFont /AAAAAE+BitstreamVeraSans-Roman
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
/Subtype /TrueType
|
||||
/FontDescriptor 9 0 R
|
||||
/FirstChar 32
|
||||
|
@ -1057,7 +1061,11 @@ endobj
|
|||
endobj
|
||||
7 0 obj
|
||||
<< /Type /Font
|
||||
<<<<<<< HEAD
|
||||
/BaseFont /AAAABP+BitstreamVeraSans-Bold
|
||||
=======
|
||||
/BaseFont /AAAAAF+BitstreamVeraSans-Bold
|
||||
>>>>>>> bdcc30825a56fc3277d230597b2a6c1f0d774d45
|
||||
/Subtype /TrueType
|
||||
/FontDescriptor 13 0 R
|
||||
/FirstChar 32
|
||||
|
@ -1068,10 +1076,11 @@ endobj
|
|||
endobj
|
||||
8 0 obj
|
||||
<< /Length1 15700
|
||||
/Length 8844
|
||||
/Length 8843
|
||||
/Filter [/FlateDecode]
|
||||
>>
|
||||
stream
|
||||
<<<<<<< HEAD
|
||||
xœÕ{|TÕ¹ïZûÛ{žyÌ$“<><E2809C>×NB‘<>ÄÄ€ •Éc€@HblÑL2“d4ÉŒ3"¢åa!P°@•P)BD@DK‘RL |