diff options
| author | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
| commit | 5293ede5f3493900df93da33197416d853f8d907 (patch) | |
| tree | 3155deaea5616fa09fc96c84567419fec5f288a2 /js | |
| parent | 9c0bda09a502472768f6dd5090a882d11be58d23 (diff) | |
| parent | 30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff) | |
| download | ninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz | |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js')
120 files changed, 670 insertions, 808 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> | ||