Files
sailing-analytics/java
Axel Uhl 0e53de740c Merge remote-tracking branch 'server/jbross-poor-mans-wizard' into jbross-poor-mans-wizard
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CreateRegattaCallback.java

Change-Id: I777eeb86995fe5e75eb31b0c85eee8ab69ad9c8d
2016-03-04 15:14:53 +01:00
..