aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-11 14:13:07 -0700
committerJonathan Duran2012-05-11 14:13:07 -0700
commit1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch)
tree2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/components/popup.reel
parent32257ac142f872d3c1f6c07504bae77ae884ed93 (diff)
parent6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff)
downloadninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Diffstat (limited to 'js/components/popup.reel')
-rwxr-xr-xjs/components/popup.reel/popup.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index 212a681f..cc31106e 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="default_popup" class="default_popup"> 29 <div data-montage-id="default_popup" class="default_popup">
30 <div class="tooltip"><span/></div> 30 <div class="tooltip"><span/></div>
31 <div class="content"></div> 31 <div class="content"></div>
32 </div> 32 </div>