Commit graph

2 commits

Author SHA1 Message Date
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
Steffen Vogel
aad462c297 seperated code from layout and structure 2010-09-27 00:26:35 +02:00