Files
sailing-analytics/java/com.sap.sailing.domain.swisstimingadapter.persistence
Steffen Schaefer 42ea70f2aa Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
2019-01-28 09:58:30 +01:00
..