Robert Benedikt e7a97749bc Merge branch 'master' into bug4703 ...

# Conflicts:
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultWithIdImpl.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/PenaltyFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java

2019-04-12 11:34:24 +02:00

..

.settings

fixed encoding

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

META-INF

fixed various DB handling after Mongo 3.x upgrade; made *.security.replication.test an eclipse-test-plugin

2018-12-11 12:56:50 +01:00

src/com/sap/sailing/server

Merge branch 'master' into bug4703

2019-04-12 11:34:24 +02:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…