Files
sailing-analytics/java
Steffen Schaefer 6450f3db42 Merge branch 'master' into foiling
Conflicts:
	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-06-22 10:10:52 +02:00
..
…