Fredrik Teschke c99af6e6a7 Merge remote-tracking branch 'origin/jan-team-image' into ftes-file-storage ...

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TeamResource.java
	java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/AmazonS3FileStorageServiceImpl.java

2015-01-23 15:13:02 +01:00

..

.settings

…

META-INF

add testing credentials for file storage

2015-01-23 15:01:26 +01:00

src/com/sap/sse/filestorage

Merge remote-tracking branch 'origin/jan-team-image' into ftes-file-storage

2015-01-23 15:13:02 +01:00

.classpath

…

.project

…

build.properties

…

pom.xml

…