aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 14:22:36 -0700
committerValerio Virgillito2012-03-20 14:22:36 -0700
commit4396c712153afff531bc702dc4c56e0a14ebe31e (patch)
treeb67dbfddaa262d8e66aaab93a9022055f8e02be5 /node_modules/components-data
parentefde3eab7a31070427142fa03f17985163a8d33b (diff)
parent803286628560fd79a57028c65c42c7f19a89c746 (diff)
downloadninja-4396c712153afff531bc702dc4c56e0a14ebe31e.tar.gz
Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montage-integration
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/feed-reader.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index 6caf768d..aa9bf340 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -11,5 +11,9 @@
11 "type": "string", 11 "type": "string",
12 "default": null 12 "default": null
13 } 13 }
14 ] 14 ],
15 "defaultStyles": {
16 "width":"350px",
17 "height":"250px"
18 }
15} \ No newline at end of file 19} \ No newline at end of file