aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-18 13:49:26 -0700
committerNivesh Rajbhandari2012-04-18 13:49:26 -0700
commite6bdea62cff68837239c1be579926693c1aa7bdf (patch)
treebddf63c8b1fc493ec64aca642b8887321674bb16 /node_modules/components-data
parent7b3ef287f248c07602aefa3ba2cc907e0d16493a (diff)
parent2e04af953463643791f6362bd8ef4c6ba190abfa (diff)
downloadninja-e6bdea62cff68837239c1be579926693c1aa7bdf.tar.gz
Merge branch 'refs/heads/ninja-internal' into EricMerge
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/textarea.json2
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