aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-20 15:16:12 -0700
committerValerio Virgillito2012-03-20 15:16:12 -0700
commit8e8200b4bbad52afe8af362f1e987bce41e4a664 (patch)
tree6cb4b2ebb16d2105c8b8f815a10f9866a628621d /node_modules/components-data
parent4396c712153afff531bc702dc4c56e0a14ebe31e (diff)
parentb6c84b1456884f55e58844a1b05e35b86e0f92c4 (diff)
downloadninja-8e8200b4bbad52afe8af362f1e987bce41e4a664.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.json5
1 files changed, 5 insertions, 0 deletions
diff --git a/node_modules/components-data/feed-reader.json b/node_modules/components-data/feed-reader.json
index aa9bf340..b2b240b2 100644
--- a/node_modules/components-data/feed-reader.json
+++ b/node_modules/components-data/feed-reader.json
@@ -10,6 +10,11 @@
10 "name": "feedURL", 10 "name": "feedURL",
11 "type": "string", 11 "type": "string",
12 "default": null 12 "default": null
13 },
14 {
15 "name": "feedDisplayMode",
16 "type": "string",
17 "default": "timer"
13 } 18 }
14 ], 19 ],
15 "defaultStyles": { 20 "defaultStyles": {