Steffen Vogel da751bda13 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org ... Conflicts: frontend/javascripts/frontend.js		2010-12-10 17:24:20 +01:00
..
bin	updated doctrine cli bootstrap file	2010-12-03 16:24:40 +01:00
lib	Merge branch 'master' of github.com:volkszaehler/volkszaehler.org	2010-12-10 17:24:20 +01: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	cosmetic changes	2010-09-22 02:32:03 +02:00
volkszaehler.conf.template.php	removed old phpdoc configuration files	2010-11-21 02:55:28 +01:00