Skip to content

Commit 7ca7ffe

Browse files
committed
Merge remote-tracking branch 'origin/10.3' into 11.x
2 parents daa8a0d + c77c602 commit 7ca7ffe

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

templates/layouts/layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{% if editmode %}
1919
{% do pimcore_head_link().appendStylesheet(asset('static/css/editmode.css')) %}
2020
{% endif %}
21-
{% do pimcore_head_script().appendFile('https://code.jquery.com/jquery-3.3.1.slim.min.js',null,null,{ integrity:"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo",crossorigin:"anonymous"}) %}
21+
{% do pimcore_head_script().appendFile('https://code.jquery.com/jquery-3.6.3.slim.min.js',null,null,{ integrity:"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo",crossorigin:"anonymous"}) %}
2222
{% do pimcore_head_script().appendFile('https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js',null,null,{ integrity:"sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1",crossorigin:"anonymous"}) %}
2323
{% do pimcore_head_script().appendFile('https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js',null,null,{ integrity:"sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM",crossorigin:"anonymous"}) %}
2424
{% do pimcore_head_script().appendFile(asset('static/lib/magnific/magnific.js')) %}

templates/layouts/print_catalog.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% endif %}
2121

2222

23-
<script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
23+
<script type="text/javascript" src="https://code.jquery.com/jquery-3.6.3.slim.min.js"></script>
2424

2525

2626

0 commit comments

Comments
 (0)