Merge branch 'master' into axel-usermanagement

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java
This commit is contained in:
Axel Uhl committed 2014-10-07 10:06:45 +02:00
commit f627fca32e
19 files changed
+578 -398

No files matched your search

+2
View File
@@ -57,6 +57,8 @@ SAP is at the center of today’s technology revolution, developing innovations
* [[Information about Extreme Sailing Series|wiki/extreme-sailing-series]]
* [[Travemünder Woche 2014 event page|wiki/tw2014]]
* [[505 worlds Kiel 2014 event page|wiki/505-worlds-kiel-2014]]
* Event Content Management
* [[Link Race Videos|wiki/race-video-linking]]
### Internal services (not related to wiki but useful)