Steffen Schaefer 3cc3345326 Merge branch 'master' into permission-vertical ...

Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java

2018-12-10 08:53:39 +01:00

..

.settings

…

META-INF

allow solution to run with both, Java8 and Java11 with same target platform

2018-11-30 21:20:06 +01:00

resources

fix for rest api's under v2 not accepting bearertoken

2018-12-03 13:17:48 +01:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into permission-vertical

2018-12-10 08:53:39 +01:00

WEB-INF

…

webservices

Merge branch 'master' into permission-vertical

2018-12-06 16:23:38 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

main.css

…

pom.xml

…