summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authora klosch <klosch@netresearch.de>2011-11-10 23:24:03 +0100
committera klosch <klosch@netresearch.de>2011-11-10 23:24:03 +0100
commit593b9df5d38ff3c341c3ee09973f83aa0d6c4e21 (patch)
treeb45b2acea3a5b0eb28bee44fd171c00ebd59ef7b /template/topic
parentff5df0b424410b0dc700b9378aa9d48953be98b3 (diff)
added stream to sublounge @template/topic
Diffstat (limited to 'template/topic')
-rw-r--r--template/topic/topic3
1 files changed, 3 insertions, 0 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 9bd8821..a298d0d 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,2 +1,5 @@
+10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a>
+@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)
+
26. November: <b>sub:conf</b><br/>
subconf at sublab dot org