diff options
author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /node_modules/components-data/feed-reader.json | |
parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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" |