Steffen Vogel 105b547cbe Merge branch 'master' of github.com:volkszaehler/volkszaehler.org ... Conflicts: frontend/index.html frontend/javascript/smartmeter.js		2010-09-27 00:36:48 +02:00
..
images	separeted frontend from backend	2010-06-07 12:11:51 +02:00
javascript	Merge branch 'master' of github.com:volkszaehler/volkszaehler.org	2010-09-27 00:36:48 +02:00
index.html	seperated code from layout and structure	2010-09-27 00:26:35 +02:00
style.css	seperated code from layout and structure	2010-09-27 00:26:35 +02:00