Steffen Schaefer 9ec1e4c0a7 Merge branch 'master' into bug5085 ...

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java

2019-12-11 10:03:57 +01:00

..

.settings

bug4987: added per-file permission management to FileStorageService impls

2019-04-10 22:14:27 +02:00

META-INF

bug4987: added per-file permission management to FileStorageService impls

2019-04-10 22:14:27 +02:00

resources

…

src/com/sap/sailing/server/gateway

Merge branch 'master' into bug5085

2019-12-11 10:03:57 +01: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

…

pom.xml

…