Kai Börnert 250783b4ae Merge branch 'master' into permission-vertical ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties

2019-02-11 09:25:45 +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-02-11 09:25:45 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…