Files
sailing-analytics/java
Axel Uhl e6fef6c04f Merge branch 'master' into bug2851
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java

Change-Id: Ifd8c60c6f7d2d2274a68681607a1b5df7b4040b7
2016-01-13 09:39:02 +01:00
..