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

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
commit 4cb7b535c8
167 files changed
+1622 -2012

No files matched your search

@@ -130,6 +130,7 @@
install-size="0"
version="1.17.1"
unpack="false"/>
<plugin
id="org.jvnet.mimepull"
download-size="0"
@@ -137,6 +138,13 @@
version="1.9.4"
unpack="false"/>
<plugin
id="org.mongodb.mongo-java-driver"
download-size="0"
install-size="0"
version="2.13.0.RELEASE"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.zxing"
download-size="0"