diff options
| author | kloschi klosch <klosch@netresearch.de> | 2012-02-02 21:56:19 +0100 |
|---|---|---|
| committer | kloschi klosch <klosch@netresearch.de> | 2012-02-02 21:56:19 +0100 |
| commit | 76f5eb72cda67da497ea4ba992778661559f26b4 (patch) | |
| tree | ee6875ff52dfb6b09df037095e254c6f8a8fc531 /template/topic | |
| parent | 343edab3eb5284dd0ec236883974f16b486e6e3b (diff) | |
| parent | 002ccb53e6319619d503972c2a6bad0d4ead0c6f (diff) | |
Merge branch 'master' of sublab.org:website
Conflicts:
public/img/onewire/digitemp.jpg
template/news/2011-12-07-frieren.html
template/pages/projekte/content.html
template/pages/verein/content.html
template/pages/vokue/content.html
template/template/template.html
template/topic/topic
Diffstat (limited to 'template/topic')
| -rw-r--r-- | template/topic/topic | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/template/topic/topic b/template/topic/topic index bbd85e6..55a7766 100644 --- a/template/topic/topic +++ b/template/topic/topic @@ -1,2 +1,16 @@ +<<<<<<< HEAD 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/> +======= +Diese Woche im sublab:<br> + +Mi, ab 19oo Elektronikrunde<br> +Do, ab 20oo about:radio Stammtisch<br> +Do, ab 21oo Freifunktreff<br> +Sa, ab 20oo Phantomspeisung<br> +So, ab 19oo Westnetzgruendung + + +<!--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/>--> +>>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f |