Kai Börnert 045c502438 Merge branch 'master' into permission-vertical ...

Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java

2019-01-07 09:07:40 +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 'master' into permission-vertical

2019-01-07 09:07:40 +01:00

.classpath

…

.gitignore

…

.project

normalized line endings

2017-05-16 09:42:02 +02: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