From 9fea93b6d5d8ae817bef6f55a4887bb2a01b0675 Mon Sep 17 00:00:00 2001
From: Benjamin Kiessling <mittagessen@l.unchti.me>
Date: Wed, 17 Dec 2014 15:44:42 +0100
Subject: Update topic

---
 template/topic/topic | 3 ---
 1 file changed, 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>-->
-- 
cgit v1.2.1