aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/image.json
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:48:34 -0700
committerJose Antonio Marquez2012-06-20 16:48:34 -0700
commit4eff115126ab946c5852d787fd596e07b156c9a5 (patch)
treef7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /node_modules/components-data/image.json
parent7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/components-data/image.json')
-rw-r--r--node_modules/components-data/image.json2
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