diff options
author | Christian Franke <nobody@nowhere.ws> | 2013-04-12 19:23:37 +0200 |
---|---|---|
committer | Christian Franke <nobody@nowhere.ws> | 2013-04-12 19:23:37 +0200 |
commit | 77a187664cae20dc6467c4a8b2f810c35812817f (patch) | |
tree | 8908478148a89a0b252b90909c12af1e8784d973 /template | |
parent | 9e8be565dc69573a4b52bfd0bef54fba0c12f45d (diff) |
Livestream
Diffstat (limited to 'template')
-rw-r--r-- | template/pages/cryptocon13/content.html | 1 | ||||
-rw-r--r-- | template/topic/topic | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/template/pages/cryptocon13/content.html b/template/pages/cryptocon13/content.html index 20b9319..17a55d3 100644 --- a/template/pages/cryptocon13/content.html +++ b/template/pages/cryptocon13/content.html @@ -7,6 +7,7 @@ Der Flyer zur CryptoCon 13 </p> </div> +<p style="font-size: 1.5em;"><a href="http://tv.foodada.de/"><b>Livestream</b></a></p> <p> Vom 11. April bis 14. April 2013 findet erstmalig die CryptoCon im sublab statt. CryptoCon: ein mehrtägiger Workshop mit Fokus auf Daten- und Kommunikationssicherheit. diff --git a/template/topic/topic b/template/topic/topic index 0391a17..71f5347 100644 --- a/template/topic/topic +++ b/template/topic/topic @@ -1,2 +1,2 @@ -26.3. - <a href="/neues">Sound Hacking Night</a><br> -11.-14.4. - <a href="/cryptocon13">CryptoCon13</a> +11.-14.4. - <a href="/cryptocon13">CryptoCon13</a><br /> +<a href="http://tv.foodada.de/"><b>Livestream</b></a> |