diff options
| author | Jonathan Duran | 2012-06-06 11:22:43 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-06 11:22:43 -0700 |
| commit | 020a8147088f09547b7e84db2ada7c48f25c089f (patch) | |
| tree | 5ec53061c4437d7a7cd8c983ef8a17aa6cfe0e19 /node_modules/components-data/feed-reader.json | |
| parent | b73cc6e348f3eb4cd57b5afeb7a6f5d3633b7e6b (diff) | |
| parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
| download | ninja-020a8147088f09547b7e84db2ada7c48f25c089f.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/components-data/feed-reader.json')
| -rw-r--r-- | node_modules/components-data/feed-reader.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json index 5e8ca527..0676cac1 100644 --- a/node_modules/components-data/feed-reader.json +++ b/node_modules/components-data/feed-reader.json | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | "possibleValues": ["animation", "timer"] | 18 | "possibleValues": ["animation", "timer"] |
| 19 | } | 19 | } |
| 20 | ], | 20 | ], |
| 21 | |||
| 21 | "defaultStyles": { | 22 | "defaultStyles": { |
| 22 | "width":"380px", | 23 | "width":"380px", |
| 23 | "height":"120px" | 24 | "height":"120px" |