Merge remote-tracking branch 'origin/design2015' into design2015-mobile

Browse Source

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventActivityProxy.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeader.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java

...

This commit is contained in:

Steffen Schaefer committed 2015-06-16 15:43:46 +02:00

2 parents eae0eadc2c 1d54a57355

commit d869f18e13

95 files changed

+2117 -844

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/images/home/arrow-grey-right.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 308 B

java/com.sap.sailing.gwt.ui/images/home/news-i.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB