composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/support/3.2' into develop

Browse Source
This commit is contained in:
jf-cbd
2024-07-02 17:21:43 +02:00
parent 113826b2e7 ab9df22e76
commit 42e78ad3a3
11 changed files with 105 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -87,6 +87,7 @@
{% block pPageScripts %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'node_modules/jquery/dist/jquery.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ajax_hook.js'|add_itop_version }}"></script>
{% if is_development_environment() %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'node_modules/jquery-migrate/dist/jquery-migrate.js'|add_itop_version }}"></script>
{% else %}