aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/textfield.json
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/components-data/textfield.json
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/components-data/textfield.json')
-rw-r--r--node_modules/components-data/textfield.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json
index cb3f1c8f..d82723b7 100644
--- a/node_modules/components-data/textfield.json
+++ b/node_modules/components-data/textfield.json
@@ -1,9 +1,9 @@
1{ 1{
2 "component": "textfield", 2 "component": "textfield",
3 3
4 "module": "montage/ui/textfield.reel", 4 "module": "montage/ui/native/input-text.reel",
5 5
6 "name": "Textfield", 6 "name": "InputText",
7 7
8 "properties": [ 8 "properties": [
9 { 9 {