mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-16 01:01:02 +00:00
Conflicts: java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LeaderboardPanel.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LogoAndTitlePanel.java java/com.sap.sailing.gwt.ui/war/AdminConsole.html java/com.sap.sailing.gwt.ui/war/images/magnifier.png java/com.sap.sailing.gwt.ui/war/images/magnifier_slashed.png java/com.sap.sailing.server/SailingServer (Proxy).launch