summaryrefslogtreecommitdiff
path: root/template/topic
diff options
context:
space:
mode:
authorFlorian <florianraemisch@web.de>2013-03-09 23:31:38 +0100
committerFlorian <florianraemisch@web.de>2013-03-09 23:31:38 +0100
commit39313bb273de2bafbac1e125521f21b31b0703ab (patch)
tree5337e5ac94ae3df13c77174c6564c70474f6633d /template/topic
parente97662f897e5424ad75a1b41d94a415b806dcf76 (diff)
added cryptocon to topic
Diffstat (limited to 'template/topic')
-rw-r--r--template/topic/topic3
1 files changed, 2 insertions, 1 deletions
diff --git a/template/topic/topic b/template/topic/topic
index 6d097e0..09ca21f 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1 +1,2 @@
-18.3. - Der meiste Matebrauworkshop aller Zeiten
+18.3. - Der meiste Matebrauworkshop aller Zeiten<br>
+11.-14.4. - <a href="/cryptocon13">CryptoCon13</a>