summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authorBenjamin Kiessling <mittagessen@l.unchti.me>2014-12-17 15:44:42 +0100
committerBenjamin Kiessling <mittagessen@l.unchti.me>2014-12-17 15:44:42 +0100
commit9fea93b6d5d8ae817bef6f55a4887bb2a01b0675 (patch)
tree5f1c74cba700c1d625b21c594f9e1757d84ca706 /template/topic
parent65325821de34a72e8dec37967ccda432c270749a (diff)
Update topic
Diffstat (limited to 'template/topic')
-rw-r--r--template/topic/topic3
1 files changed, 0 insertions, 3 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 899d55a..e70c1f4 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,4 +1 @@
<p><a href="/wiki/Fundsachen">Fundsachen</a></p>
-<p>22. bis 25. Mai: <a href="/cryptocon14">CryptoCon</a></p>
-<!--<p><a href="http://188.40.166.4:9000/cc14.ogg">LiveStream</a>
-Try VLC/Firefox/Chrome for playback)</p>-->