summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorkloschi klosch <klosch@netresearch.de>2012-03-29 21:02:25 +0200
committerkloschi klosch <klosch@netresearch.de>2012-03-29 21:02:25 +0200
commit7fd5e945e71cf08faf609176bf13ba515b0d7c30 (patch)
treead1139c06adccec285b1a773abb7cda401087101 /template
parentdc4e5df7a34d3cd4f340ba2a217ce88f09c16b0b (diff)
added stream for tonite
Diffstat (limited to 'template')
-rw-r--r--template/topic/topic9
1 files changed, 2 insertions, 7 deletions
diff --git a/template/topic/topic b/template/topic/topic
index cc83826..bf63655 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,7 +1,2 @@
-<b>Diese Woche im sublab:</b><br>
-
-Mi 19oo: Chaostreff (c3le)<br>
-Do 21oo: about:radio Stammtisch<br>
-Sa 20oo: Phantomspeisung<br>
-So 18oo: Westnetztreffen<br>
-So 19oo: Kaffeeklatsch<br>
+Mar 29 - <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>)