Steffen Schaefer 671b73c805 Merge branch 'master' into permission-vertical ...

# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BranchIOConstants.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/qrcode/QRCodePlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/qrcode/QRCodePresenter.java

2019-01-17 13:37:54 +01:00

..

.settings

…

META-INF

cleaned up dtos a little

2018-11-28 09:49:33 +01:00

src/com/sap/sailing

Merge branch 'master' into permission-vertical

2019-01-17 13:37:54 +01:00

.classpath

…

.gitignore

…

.project

…

build.gradle

…

build.properties

…

pom.xml

…