Thomas Wiese 2985b6fca4 Merge branch 'permission-vertical' into bug4709_pv ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/resources/shiro.ini

2018-11-08 09:18:39 +01:00

..

.settings

…

META-INF

Merge branch 'master' into permission-vertical

2018-10-23 13:10:46 +02:00

resources

…

src/com/sap/sailing/server

Merge branch 'permission-vertical' into bug4709_pv

2018-11-08 09:18:39 +01:00

.classpath

…

.gitignore

…

.project

…

build.properties

…

pom.xml

…

SailingServer (No Proxy OSX).launch

…

SailingServer (No Proxy, Cached MTB).launch

…

SailingServer (No Proxy, Jetty on 8889, auto-replicate dev).launch

…

SailingServer (No Proxy, Jetty on 8889, auto-replicate).launch

…

SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch

…

SailingServer (No Proxy, Jetty on 8889).launch

…

SailingServer (No Proxy, Jetty on 8890).launch

…

SailingServer (No Proxy, Remote Debug SAP VM).launch

…

SailingServer (No Proxy, winddbTest).launch

…

SailingServer (No Proxy).launch

…

SailingServer (Proxy, Jetty on 8889).launch

…

SailingServer (Proxy, Remote Debug SAP VM).launch

…

SailingServer (Proxy, SwissTiming Live Simulation).launch

…

SailingServer (Proxy, winddbTest).launch

…

SailingServer (Proxy).launch

…