Merge branch 'master' into chrome-testrunner-1387

This commit is contained in:
Colm Seale 2017-01-14 02:08:13 +00:00 committed by GitHub
commit 1ce1d29c87
2 changed files with 10 additions and 0 deletions

View File

@ -33,6 +33,11 @@ define([
legacyRegistry.register("example/scratchpad", {
"extensions": {
"roots": [
{
"id": "scratch:root"
}
],
"models": [
{
"id": "scratch:root",
"model": {

View File

@ -35,6 +35,11 @@ define([
"description": "Example illustrating the addition of a static top-level hierarchy",
"extensions": {
"roots": [
{
"id": "exampleTaxonomy"
}
],
"models": [
{
"id": "exampleTaxonomy",
"model": {