diff options
author | Nivesh Rajbhandari | 2012-06-05 11:36:38 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-05 11:36:38 -0700 |
commit | 7b02dcf3ae97674bd8d87ad9909abcb439350b61 (patch) | |
tree | a79c29d6b66c5681c476de03ea797cec8575e499 /node_modules/components-data/picasa-carousel.json | |
parent | 945fac7b1593260757b6f2864810ca9916d7d698 (diff) | |
parent | 73a62c95b5635fee903457279f0f5b57f164e0b5 (diff) | |
download | ninja-7b02dcf3ae97674bd8d87ad9909abcb439350b61.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolOptions
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", |