Files
sailing-analytics/java/com.sap.sailing.server.gateway/WEB-INF
Fredrik Teschke b0668ecec8 Merge branch 'master' into gps-export
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
2013-07-02 18:03:46 +02:00
..
2013-07-02 18:03:46 +02:00