Files
sailing-analytics/java/com.sap.sailing.server.test/META-INF
Jens Rommel eb8742ea33 Merge remote-tracking branch 'refs/remotes/external/master' into bug1978-docked-video-component
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/MediaLibrary.java
2014-09-24 13:54:52 +02:00
..