Merge branch 'hotfix/371'

uccser · Jul 13, 2016 · 37242f4 · 37242f4
2 parents 02dbd63 + f037ebb
commit 37242f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/generator/generator-settings.conf b/generator/generator-settings.conf
@@ -1,5 +1,5 @@
 [General]
-Version Number: v2.6.0
+Version Number: v2.6.1
 Google Analytics Code: UA-49289263-2
 Domain: http://www.csfieldguide.org.nz/
 

diff --git a/interactives/action-menu/index.html b/interactives/action-menu/index.html
@@ -28,17 +28,14 @@
 
       <p id="confirmationText"> </p>
 
+    </div>
+    <script src="./js/actionmenu.js"></script>
     <!-- ### End of required HTML for inline interactives ### -->
     </div>
 
     <!-- jQuery (necessary for Materialize) -->
     <script type="text/javascript" src="../base-files/js/third-party/jquery.js"></script>
     <!-- Materialize responsive CSS -->
     <script type="text/javascript" src="../base-files/js/third-party/materialize.min.js"></script>
-    <script src="./js/actionmenu.js"></script>
-
-    </div>
-
-
   </body>
 	</html>