Frank Mittag 98abbf7cb4 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes ...

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

2018-02-07 13:38:32 +01:00

..

.settings

normalized line endings

2017-05-16 09:42:02 +02:00

META-INF

Initial commit

2017-11-22 10:38:42 +01:00

src/com/sap/sse

Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes

2018-02-07 13:38:32 +01:00

.classpath

normalized line endings

2017-05-16 09:42:02 +02:00

.project

normalized line endings

2017-05-16 09:42:02 +02:00

build.gradle

…

build.properties

normalized line endings

2017-05-16 09:42:02 +02:00

pom.xml

…