Files
sailing-analytics/java/com.sap.sailing.server
Steffen Schaefer 379d598456 Merge branch 'bug2822_boatcolors' into bug4416
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractRegattaLogSensorDataAddMappingsDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ItemToMapToDeviceSelectionPanel.java
2018-03-06 17:54:50 +01:00
..
2017-10-26 00:12:43 +02:00
…
…