Merge branch 'next' into prod

This commit is contained in:
Robbie Antenesse 2016-03-17 12:49:25 -06:00
commit 36150e4c76
1 changed files with 5 additions and 1 deletions

View File

@ -142,9 +142,13 @@ catch (PDOException $ex) {}
<script src="/js/defiant.js"></script>
<!-- Diacritics Removal for Exports -->
<script src="/js/removeDiacritics.js"></script>
<!-- Main Script -->
<!-- Helper Functions -->
<script src="/js/helpers.js"></script>
<!-- Main Functions -->
<script src="/js/dictionaryBuilder.js"></script>
<!-- UI Functions -->
<script src="/js/ui.js"></script>
<!-- Public View Functions -->
<script src="/js/publicView.js"></script>
<?php if ($_GET['adminoverride'] != "noadsortracking") { include_once("../php/google/analytics.php"); } ?>
<script>