aboutsummaryrefslogtreecommitdiff
path: root/js/components/about-box.reel
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/components/about-box.reel
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/about-box.reel')
-rw-r--r--js/components/about-box.reel/about-box.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index 1f41699e..ecdd4389 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -21,7 +21,7 @@
21 </script> 21 </script>
22</head> 22</head>
23<body> 23<body>
24<div class="mainAboutBoxContainer" id="mainAboutBoxContainer"> 24<div data-montage-id="mainAboutBoxContainer" class="mainAboutBoxContainer">
25 <div id="about_box_ninja_logo"></div> 25 <div id="about_box_ninja_logo"></div>
26 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 26 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 27 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>