Commit Graph

2 Commits

Author SHA1 Message Date
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
stubbfel
e483304ac8 add sps service 2013-06-19 15:31:09 +02:00