summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian <florianraemisch@web.de>2011-12-11 16:48:19 +0100
committerChristian Franke <nobody@nowhere.ws>2012-01-12 11:59:24 +0100
commitf9e6b76c6a85f089c0fa9c5d9c33eeb5ecee4a22 (patch)
treefb5fbfb22a71a9a9d7644ae68c0c44665ffbf0f6
parentaf94e7be7890bf786e33e15a6295983339330d47 (diff)
updatet topic for outside the box
-rw-r--r--template/topic/topic5
1 files changed, 3 insertions, 2 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 1b55eba..5c1484a 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,2 +1,3 @@
-Die <a href="./subconf">subconf</a> ist vorbei!<br>
-Danke fuers kommen.
+<!--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/>-->
+Gerade im sublab: Outside the Box Release Party mit Lesung