aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 10:58:23 -0700
committerValerio Virgillito2012-05-03 10:58:23 -0700
commit9f654de3c56475b8e9d34183eb6dd9f2d0381b76 (patch)
treee6ba6681343eacc0de4935666506facaa5ca0b9a /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
parentbe1806505f4af86c3b5c15454e67cb8cec696554 (diff)
parent4feaf41f201e56c1332208851d7dee4f060aaf89 (diff)
downloadninja-9f654de3c56475b8e9d34183eb6dd9f2d0381b76.tar.gz
Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 0698a6dc..f65d5bc0 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cpp_popup" class="cpp_popup"> 29 <div data-montage-id="cpp_popup" class="cpp_popup">
30 <div class="cp_pu_options"> 30 <div class="cp_pu_options">
31 31
32 <div class="cp_pu_history"> 32 <div class="cp_pu_history">