Vladislav Chumak 74c6ffee72 Merge remote-tracking branch 'origin/master' into maneuver_refactoring ...

Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuversWithEstimationDataJsonSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java

2018-03-31 01:54:14 +02:00

..

.settings

normalized line endings

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

META-INF

added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule

2018-03-24 01:45:37 +01:00

src/com/sap/sailing/server/gateway

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

2018-03-31 01:54:14 +02:00

.classpath

normalized line endings

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

.gitignore

…

.project

normalized line endings

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

build.gradle

Merge branch 'bug2572' into android_apps

2015-01-14 17:02:18 +01:00

build.properties

normalized line endings

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

pom.xml

normalized line endings

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