Thomas Wiese 1a6441693f Merge branch 'permission-vertical' into bug4709_pv ...

Conflicts:
	java/com.sap.sailing.server.gateway/resources/shiro.ini
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java

2018-11-23 16:05:09 +01:00

..

.settings

fixed encoding

2018-10-11 18:09:58 +02:00

META-INF

fixed missing dependencies for tests

2018-11-14 16:18:35 +01:00

src/com/sap/sailing/server

Merge branch 'permission-vertical' into bug4709_pv

2018-11-23 16:05:09 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…