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

..

api

add doku

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

config

add doku

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

database

Merge branch 'feature/#50' into devel

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

nbproject

update api

2013-05-20 14:46:49 +02:00

service

add sps service

2013-06-19 15:31:09 +02:00

thirdparty/Slim

update api

2013-05-20 14:46:49 +02:00

.htaccess

inint api

2013-05-16 13:42:39 +02:00

global.inc.php

add doku

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

index.php

update api

2013-05-20 14:46:49 +02:00