Files
sailing-analytics/java/com.sap.sailing.domain.common/META-INF
Steffen Schaefer 3d3ee72b0c Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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
2016-04-28 08:26:11 +02:00
..
2016-04-28 08:26:11 +02:00