Thomas Wiese 475356f8b8 Merge branch 'permission-vertical' into bug4813 ...

# Conflicts:
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java

2018-12-18 13:32:12 +01:00

..

.settings

fixed encoding

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

META-INF

Merge branch 'master' into permission-vertical

2018-12-17 14:36:37 +01:00

src/com/sap/sailing/server

Merge branch 'permission-vertical' into bug4813

2018-12-18 13:32:12 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…