vzlogger/backend
Steffen Vogel ef27d17160 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org
Conflicts:
	backend/lib/Interpreter/MeterInterpreter.php
	backend/lib/View/JSON.php
2010-09-19 20:52:13 +02:00
..
bin several cosmetic changes 2010-09-19 20:48:19 +02:00
lib Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2010-09-19 20:52:13 +02:00
.gitignore several cosmetic changes 2010-09-19 20:48:19 +02:00
.htaccess change api urls to prettier version 2010-09-04 01:25:52 +02:00
index.php several cosmetic changes 2010-09-19 20:48:19 +02:00
volkszaehler.conf.default.php fixed warnings for phpdoc 2010-09-04 02:00:12 +02:00