Merge remote-tracking branch 'origin/open987' into open-master

2015-03-16 10:28:55 -07:00
parent c2d7996785 d8d28d892d
commit 8673e2045e
14 changed files with 721 additions and 2 deletions
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -221,6 +221,12 @@
                        ],
                        "key": "layoutGrid",
                        "conversion": "number[]"
+                    },
+                    {
+                        "label": "Panel(s)",
+                        "control": "selector",
+                        "type": "telemetry.panel",
+                        "key": "somethingElse"
                    }
                ]
            },