summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian <florianraemisch@web.de>2011-12-18 22:37:00 +0100
committerChristian Franke <nobody@nowhere.ws>2012-01-12 11:59:29 +0100
commit32d8908381e57deb6bb24decc422325503eeece0 (patch)
treed1a3e5b1059a4043e36136abebcfaf6d7169eb0a
parentc1efadbad0468e4673e364590a96abea4765b66d (diff)
updated topic
-rw-r--r--template/topic/topic6
1 files changed, 5 insertions, 1 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 1473810..c64c354 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,4 +1,8 @@
-Freitag im sublab:<br>
+Diese Woche im sublab:<br>
+Mi, ab 20oo: Chaostreff<br>
+Do, ab 21oo: sub:lounge<br>
+
+<!--Freitag im sublab:<br>-->
<a href="/neues#2011-12-14-wotorwoerld">W O T Ø R W O E R L D</a>
<!--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/>-->