diff options
author | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-19 07:30:06 -0700 |
commit | fa7761eb547372f846a304d775e717a7ef1cbf35 (patch) | |
tree | c60e59702d66cf9b74d5b65ca64918d6e655a2eb /node_modules/components-data | |
parent | 260bc6db6273258f9a05c21d178273e1c302affb (diff) | |
parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
download | ninja-fa7761eb547372f846a304d775e717a7ef1cbf35.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'node_modules/components-data')
-rw-r--r-- | node_modules/components-data/textarea.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json index 8e780954..0dd7714e 100644 --- a/node_modules/components-data/textarea.json +++ b/node_modules/components-data/textarea.json | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | "module": "montage/ui/textarea.reel", | 4 | "module": "montage/ui/textarea.reel", |
5 | 5 | ||
6 | "name": "TextArea", | 6 | "name": "Textarea", |
7 | 7 | ||
8 | "properties": [ | 8 | "properties": [ |
9 | 9 | ||