summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authora klosch <klosch@netresearch.de>2011-12-08 22:04:35 +0100
committera klosch <klosch@netresearch.de>2011-12-08 22:04:35 +0100
commit3c87791f9b82186244639673e2e1d88d03266250 (patch)
tree54025107523c19cb8b5fef547ae57950d8b6c5c7
parenta544a06a205be85932925ed5d246da2c89b78a3e (diff)
stream added
-rw-r--r--template/topic/topic4
1 files changed, 2 insertions, 2 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 7e72b6e..0851166 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,5 +1,5 @@
-<!--10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
+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/>
-<br/>-->
+<br/>
26. November: <b>sub:conf</b><br/>
subconf at sublab dot org