Merge remote-tracking branch 'origin/master' into windestimation

This commit is contained in:
Vladislav Chumak
2018-12-21 16:30:07 +01:00
473 changed files with 2525 additions and 2085 deletions
-2
View File
@@ -14,8 +14,6 @@ java/com.sap.sse.security.ui/WEB-INF/deploy/*
sailing_debug0*
dist
build
/java/.settings/org.eclipse.jdt.core.prefs
/java/com.sap.sailing.server.gateway.serialization.test/.settings/*.prefs
.DS_Store
java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
/mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml