Ignore:
Timestamp:
03/03/2016 11:44:50 AM (9 years ago)
Author:
Norbert Wigbels <norbert.wigbels@…>
Branches:
master
Children:
8b9b145
Parents:
7e221fe (diff), 20d3261 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of wigbels.net:/var/git/public

File:
1 edited

Legend:

Unmodified
Added
Removed
  • de.wigbels.ruby/hothotread/web/index.html

    r7e221fe re397ced  
    33<body>
    44
     5<h2>Temperatur</h2>
     6<img src="../temperatur_1tag.png">
     7
    58<h2>Gas</h2>
     9<img src="gas_3hour.png">
     10<img src="gas_6hour.png">
     11<img src="gas_12hour.png">
    612<img src="gas_1tag.png">
    713<img src="gas_1week.png">
     
    1218
    1319<h2>Strom</h2>
     20<img src="consum_10minutes.png">
     21<img src="consum_30minutes.png">
     22<img src="consum_1hour.png">
     23<img src="consum_3hour.png">
     24<img src="consum_6hour.png">
     25<img src="consum_12hour.png">
    1426<img src="consum_1day.png">
    1527<img src="consum_1week.png">
Note: See TracChangeset for help on using the changeset viewer.