diff options
author | Jon Reid | 2012-06-20 15:05:26 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /node_modules/components-data/button.json | |
parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
Diffstat (limited to 'node_modules/components-data/button.json')
-rw-r--r-- | node_modules/components-data/button.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json index a931afcb..73ed2c9c 100644 --- a/node_modules/components-data/button.json +++ b/node_modules/components-data/button.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "component": "button", | 2 | "component": "button", |
3 | 3 | ||
4 | "module": "montage/ui/button.reel", | 4 | "module": "montage/ui/native/button.reel", |
5 | 5 | ||
6 | "name": "Button", | 6 | "name": "Button", |
7 | 7 | ||