diff options
| author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
| commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
| tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/components-data/image.json | |
| parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/components-data/image.json')
| -rw-r--r-- | node_modules/components-data/image.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/image.json b/node_modules/components-data/image.json index 22548cf9..3dee2365 100644 --- a/node_modules/components-data/image.json +++ b/node_modules/components-data/image.json | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "component": "imageComponent", | 2 | "component": "imageComponent", |
| 3 | 3 | ||
| 4 | "module": "montage/ui/image.reel", | 4 | "module": "montage/ui/native/image.reel", |
| 5 | 5 | ||
| 6 | "name": "Image", | 6 | "name": "Image", |
| 7 | 7 | ||