Files
sailing-analytics/java/com.sap.sse.security.persistence
Steffen Schaefer d587c44846 Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
	mobile/com.sap.sailing.android.shared/.classpath
2019-02-04 08:52:44 +01:00
..
…