stubbfel aa7eb9c3ea Merge branch 'feature/#50' into devel ...

Conflicts:
	geoapi/api/Api.php
	geoapi/api/SpsApi.php
	geoapi/database/HelloApiSQLManager.php

2013-06-20 11:27:31 +02:00

..

HelloApiSQLManager.php

add doku

2013-06-20 11:26:10 +02:00

SpsSqlManager.php

Merge branch 'feature/#50' into devel

2013-06-20 11:27:31 +02:00

SqlManager.php

Merge branch 'feature/#50' into devel

2013-06-20 11:27:31 +02:00