eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 12:15:28 +00:00
Code Activity

Merge branch 'master' into bug5153

Browse Source 
# Conflicts:
#	java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
#	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
#	java/com.sap.sse.debranding/src/com/sap/sse/debranding/ClientConfigurationServlet.java
This commit is contained in:
Georg Herdt
2020-05-15 15:15:27 +02:00
parent d7e375484c d0673be9bc
commit 85625ae715
516 changed files with 10150 additions and 9122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.debranding/META-INF/MANIFEST.MF
+1
View File
@@ -8,6 +8,7 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.servlet;version="3.1.0",
javax.servlet.http;version="3.1.0",
javax.ws.rs.core;version="1.1.1",
org.apache.http
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy