diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2015-12-22 19:42:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-22 19:51:21 +0100 |
| commit | d033597c5d34fa27e4e07943882ca3d7e1d3926e (patch) | |
| tree | 389df22fd38aa92913899506c600e501d4d43310 /phpBB/styles/prosilver/template/overall_footer.html | |
| parent | Merge pull request #4091 from marc1706/ticket/14373 (diff) | |
| parent | Merge pull request #4093 from VSEphpbb/ticket/14374 (diff) | |
| download | phpbb-d033597c5d34fa27e4e07943882ca3d7e1d3926e.tar.gz phpbb-d033597c5d34fa27e4e07943882ca3d7e1d3926e.tar.bz2 phpbb-d033597c5d34fa27e4e07943882ca3d7e1d3926e.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/adm/style/installer_footer.html
Diffstat (limited to 'phpBB/styles/prosilver/template/overall_footer.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 61a370dbae..0573abec64 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -41,7 +41,7 @@ </div> <script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> <script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS forum_fn.js --> <!-- INCLUDEJS ajax.js --> |