Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation

Browse Source

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target

...

This commit is contained in:

Fredrik Teschke committed 2015-02-13 08:29:41 +01:00

2 parents a211e5427a df3b798bda

commit 4cb7b535c8

167 files changed

+1622 -2012

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.sse.shared.android/META-INF/MANIFEST.MF

Executable → Regular

File mode changed.