aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/button.json
diff options
context:
space:
mode:
authorAnanya Sen2012-06-20 15:20:04 -0700
committerAnanya Sen2012-06-20 15:20:04 -0700
commitcaa9683fd259307658f96190a5c5bd771126fbb8 (patch)
tree83983a8819487ce8b33f65f5d20e34af2df8dd26 /node_modules/components-data/button.json
parentd852ea28dad399e84e8d5e69c0293500c30b59f1 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'node_modules/components-data/button.json')
-rw-r--r--node_modules/components-data/button.json2
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