Merge pull request #51 from zowe/rc

Rc
zowe · May 4, 2019 · 2d6095c · 2d6095c
2 parents c1ce5c3 + ab31f7f
commit 2d6095c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/doc/swagger/fileapi.yaml b/doc/swagger/fileapi.yaml
@@ -330,6 +330,11 @@ paths:
           description: the file that should be returned
           required: true
           type: string
+        - name: responseType
+          in: query
+          description: the file should be returned in "base64" or "raw"
+          required: true
+          type: string
       responses:
         '200':
           description: successful operation
@@ -897,4 +902,4 @@ definitions:
           type: object
           properties:
             name:
-              type: string
+              type: string
diff --git a/plugins/org.zowe.zlux.ng2desktop.settings.json b/plugins/org.zowe.zlux.ng2desktop.settings.json
@@ -0,0 +1,4 @@
+{
+  "identifier": "org.zowe.zlux.ng2desktop.settings",
+  "pluginLocation": "../../zlux-app-manager/system-apps/system-settings-preferences"
+}