diff options
| author | Pushkar Joshi | 2012-06-06 07:54:11 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-06 07:54:11 -0700 |
| commit | cfa1402ac2ce831a83a9d4263d06c452c157a414 (patch) | |
| tree | adb8f1f1ad1c4dd1e7e9eee1bd206f1ec338d20c /node_modules/components-data/picasa-carousel.json | |
| parent | 8606ee7ec851cb0a971e7556eba5d9386f1b3639 (diff) | |
| parent | 5ba54dc275b07e7b2d0ed14751761d1e663d3d14 (diff) | |
| download | ninja-cfa1402ac2ce831a83a9d4263d06c452c157a414.tar.gz | |
Merge branch 'pentool' into brushtool
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", |