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/picasa-carousel.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/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", |