summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authora klosch <klosch@netresearch.de>2011-12-08 22:04:35 +0100
committerChristian Franke <nobody@nowhere.ws>2012-01-12 11:57:24 +0100
commit2fb6c62aa323bd1595381b06b5282374f2bab7a2 (patch)
tree2f2b1061baf90a0c951b614464313e2c49a5150c /template/topic
parent67e6a1f83aa8776a39f479732bcc786492061287 (diff)
stream added
Diffstat (limited to 'template/topic')
-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