c3d2/c3d2-web
c3d2
/
c3d2-web
38
3
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

This commit is contained in:
koeart 2012-06-26 16:16:56 +02:00
parent 1f503f2e16 85596075e3
commit 6aaf47c42f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/events.xml
View File

@ -1134,7 +1134,18 @@
<event title="Trollcon">
<start>2012-10-20</start>
<end>2012-10-21</end>
<linK>http://trollcon.de/</linK>
<link>http://trollcon.de/</link>
<location>RaumZeitLabor, Mannheim</location>
</event>
<event title="MRMCD 2012">
<start>2012-09-07</start>
<end>2012-09-09</end>
<link>http://mrmcd.net/</link>
<location>Darmstadt</location>
</event>
<event title="Hamburger Maker-Treffen">
<start>2012-10-20</start>
<link>http://www.hamburger-makertreffen.de/</link>
<location>Attraktor, Hamburg</location>
</event>
</calendar>