Steffen Schaefer 55f9a2667a Merge branch 'master' into bug5099 ...

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/AbstractLeaderboardsResource.java

2019-07-25 15:52:28 +02:00

..

.settings

…

META-INF

…

resources

[INTERNAL] Translation delivery: commit by SLS

2019-05-30 16:02:55 +00:00

src/com/sap/sailing/server/gateway

Merge branch 'master' into bug5099

2019-07-25 15:52:28 +02:00

WEB-INF

…

webservices

Bug 5099: Added leaderboardDiscardThresholds parameter to createEvent

2019-07-23 13:21:50 +02:00

.classpath

…

.gitignore

…

.project

Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";

2019-05-28 21:54:20 +02:00

build.properties

…

main.css

…

pom.xml

…