aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/button.json
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /node_modules/components-data/button.json
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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