summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authora klosch <klosch@netresearch.de>2011-11-10 23:24:03 +0100
committerChristian Franke <nobody@nowhere.ws>2012-01-12 11:57:23 +0100
commit4ff34d95ca1b25aa247fb6f9261d8430a219ea1e (patch)
tree1e37a2aaebc1803af156d973c989ecc9013f41f1 /template/topic
parent0e14d88e2a98714fadd17ea78e8103a9ff6664f2 (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