summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorBenjamin Kiessling <mittagessen@l.unchti.me>2012-01-23 12:28:09 +0100
committerBenjamin Kiessling <mittagessen@l.unchti.me>2012-01-23 12:28:09 +0100
commitbcfea349d851008606071397e6b01cf8eebc6caf (patch)
tree9956209ba09dd10a6d9e9a8b1a072130bb611b6d /template
parent750bfec70c1e2aa4705c21d0868ec94f772bb58d (diff)
Update Topic
Diffstat (limited to 'template')
-rw-r--r--template/topic/topic9
1 files changed, 5 insertions, 4 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 82357d9..b3f5558 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,10 +1,11 @@
Diese Woche im sublab:<br>
-Mi, ab 19oo Chaostreff<br>
-Do, ab 20oo sub:lounge<br>
-Do, ab 20oo Freifunktreff<br>
+Mi, ab 19oo Elektronikrunde<br>
+Do, ab 20oo about:radio Stammtisch<br>
+Do, ab 21oo Freifunktreff<br>
Sa, ab 20oo Phantomspeisung<br>
-So, ab 18oo Kaffeeklatsch
+So, ab 19oo Westnetzgruendung
+
<!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->