Files
sailing-analytics/java
Axel Uhl 7c025f8813 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/leaderboard/TabletAndDesktopLeaderboardView.java
2014-11-06 12:23:01 +01:00
..