diff options
author | Pushkar Joshi | 2012-06-05 14:55:17 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-05 14:55:17 -0700 |
commit | f6584f0704be628a91e3749e0607e855aeda2477 (patch) | |
tree | c7f69d015ef0d56b492904bd14b44be590389766 /node_modules/components-data/picasa-carousel.json | |
parent | 3293b0b730227c14bd4f7bd53c125b48f9886764 (diff) | |
parent | 783097854612a292ac1be18ff15d88343013f773 (diff) | |
download | ninja-f6584f0704be628a91e3749e0607e855aeda2477.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
-rw-r--r-- | node_modules/components-data/picasa-carousel.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json index b0711b12..4ab329e5 100644 --- a/node_modules/components-data/picasa-carousel.json +++ b/node_modules/components-data/picasa-carousel.json | |||
@@ -12,6 +12,7 @@ | |||
12 | "default": "" | 12 | "default": "" |
13 | } | 13 | } |
14 | ], | 14 | ], |
15 | |||
15 | "defaultStyles": { | 16 | "defaultStyles": { |
16 | "width":"800px", | 17 | "width":"800px", |
17 | "height":"160px", | 18 | "height":"160px", |