aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-entry.reel/document-entry.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 15:04:45 -0700
committerJonathan Duran2012-06-20 15:04:45 -0700
commitc6ae80c488621d4ac189cb63309b6258115f823a (patch)
treedfa26112e1830972fcb212bbb5b17c9a901c645f /js/components/layout/document-entry.reel/document-entry.html
parent022e714cb5d10cd8575ab9907eddfb184a990b66 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.html')
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index e68d17c5..ebaa4ccd 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -20,7 +20,7 @@
20 }, 20 },
21 21
22 "closeButton": { 22 "closeButton": {
23 "prototype": "montage/ui/button.reel", 23 "prototype": "montage/ui/native/button.reel",
24 "properties": { 24 "properties": {
25 "element": {"#": "close-btn"}, 25 "element": {"#": "close-btn"},
26 "identifier": "closeButton" 26 "identifier": "closeButton"