summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authorBenjamin Kiessling <mittagessen@l.unchti.me>2012-01-17 12:02:40 +0100
committerBenjamin Kiessling <mittagessen@l.unchti.me>2012-01-17 12:02:40 +0100
commit33d2ec32e1f5985baa042b1b837cec6f1a9e6ff0 (patch)
tree0a0248cb54f1d652c4e122b8f4b43dad6f14cfc2 /template/topic
parent29ed9ab57b128e428aee34cfb81a35790594f545 (diff)
Update topic
Diffstat (limited to 'template/topic')
-rw-r--r--template/topic/topic8
1 files changed, 5 insertions, 3 deletions
diff --git a/template/topic/topic b/template/topic/topic
index b7120e8..82357d9 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,8 +1,10 @@
Diese Woche im sublab:<br>
-Mo, ab 20oo Montagsrunde FSFE<br>
-Mi, ab 18oo Elektronikrune<br>
+
+Mi, ab 19oo Chaostreff<br>
+Do, ab 20oo sub:lounge<br>
Do, ab 20oo Freifunktreff<br>
-Sa, ab 20oo Phantomspeisung
+Sa, ab 20oo Phantomspeisung<br>
+So, ab 18oo Kaffeeklatsch
<!--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/>-->