Merge remote-tracking branch 'origin/10.3' into 11.x

pimcore · Mar 2, 2023 · 7ca7ffe · 7ca7ffe
2 parents daa8a0d + c77c602
commit 7ca7ffe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/layouts/layout.html.twig b/templates/layouts/layout.html.twig
@@ -18,7 +18,7 @@
             {% if editmode %}
                 {% do pimcore_head_link().appendStylesheet(asset('static/css/editmode.css')) %}
             {% endif %}
-            {% 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"}) %}
+            {% 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"}) %}
             {% 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"}) %}
             {% 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"}) %}
             {% do pimcore_head_script().appendFile(asset('static/lib/magnific/magnific.js')) %}

diff --git a/templates/layouts/print_catalog.html.twig b/templates/layouts/print_catalog.html.twig
@@ -20,7 +20,7 @@
     {% endif %}
 
 
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.3.slim.min.js"></script>