Files
sailing-analytics/java
Axel Uhl 5a75caf0f5 Merge branch 'master' into ubilabs--rcapp--bug-1267
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: I5fa5dce7ca0cbb7d7b4c7804fe010b7200b64bf3
2016-04-15 10:49:18 +02:00
..