Merge staging (v1.4.0)

zowe · Jul 18, 2019 · 7a03075 · 7a03075
2 parents 4ab1f26 + 10c874f
commit 7a03075
Show file tree

Hide file tree

Showing 6 changed files with 1,035 additions and 844 deletions.
diff --git a/nodeServer/package-lock.json b/nodeServer/package-lock.json
diff --git a/sample-angular-app.ppf b/sample-angular-app.ppf
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  This program and the accompanying materials are made available under the terms of the
+  Eclipse Public License v2.0 which accompanies this distribution, and is available at
+  https://www.eclipse.org/legal/epl-v20.html
+  SPDX-License-Identifier: EPL-2.0
+  Copyright Contributors to the Zowe Project.
+-->
+<Project default_configuration_name="Configuration 1" fallback_default_config_name="Configuration 1" file_encoding="ISO-8859-1" ltd_name="javascript" name="sample-angular-app" version="9.0.3.11">
+	<Configuration name="Configuration 1"/>
+	<Source exclude="false" path="." web="false"/>
+	<ProjectScanSettings/>
+</Project>