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/template | |
| 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/template')
| -rw-r--r-- | template/template/template.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/template/template/template.html b/template/template/template.html index e6944ef..a1fb7dd 100644 --- a/template/template/template.html +++ b/template/template/template.html @@ -53,6 +53,9 @@ <a href="/raeume">Räume</a> </li> <li> + <a href="/projekte">Projekte</a> + </li> + <li> <a href="/webcam">Webcams</a> </li> <li> @@ -117,6 +120,13 @@ <hr> <a href="/webcam" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a> <hr> +<<<<<<< HEAD +======= + <a href="/img/tempgraph.png" class="img"><img src="img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb"></a> + <hr> + <object data="http://reeknersprook.de/sublog/graph-small?width=180" type="image/png" title="sublog/graph"></object> + <hr> +>>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f <p class="member"> <a href="inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a> </p> @@ -134,7 +144,7 @@ <a href="http://c3le.de">c3le</a> | <a href="http://leipzig.freifunk.net">Freifunk Leipzig</a> | <a href="https://wiki.fsfe.org/groups/Leipzig">FSFE Leipzig</a> | - <a href="http://sofakind.de/lml/index.php">Linux Multimedia Lab</a> | + <a href="http://hackstatt.org">Hackstatt</a> | sub:lounge | <a href="http://aboutradio.org">about:radio</a> </p> |