Merge branch 'CONC-683' into test

* CONC-683: Making var not required Adding SFDC config var # Conflicts: # client/app/simulator/mobile/device-panel.component.js
xively · Jan 27, 2017 · 589bb39 · 589bb39
2 parents 5c7ca70 + 9145cad
commit 589bb39
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app.json b/app.json
@@ -37,6 +37,11 @@
       "description": "Your Salesforce token",
       "required": false
     },
+    "SALESFORCE_SYNC_ALL_ASSETS": {
+      "description": "Export all devices into Salesforce Account and Assets",
+      "required": false,
+      "value": false
+    },
     "DEVICE_HEARTBEAT": {
       "description": "Virtual device auto ping",
       "required": false,