Merge branch 'qa/14' into develop

Forward port #14
mezzio · Apr 16, 2020 · ffb4856 · ffb4856
2 parents d3e5802 + 855ae2b
commit ffb4856
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,7 +32,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- [#14](https://github.com/mezzio/mezzio-skeleton/pull/14) updates asset: [jQuery 3.5.0](https://blog.jquery.com/2020/04/10/jquery-3-5-0-released/).
 
 ### Deprecated
 

diff --git a/src/MezzioInstaller/Resources/templates/laminas-view/layout.phtml b/src/MezzioInstaller/Resources/templates/laminas-view/layout.phtml
@@ -4,7 +4,7 @@ $this->headLink()
     ->prependStylesheet('https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css');
 $this->inlineScript()
     ->prependFile('https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js')
-    ->prependFile('https://code.jquery.com/jquery-3.4.1.min.js');
+    ->prependFile('https://code.jquery.com/jquery-3.5.0.min.js');
 ?>
 <!DOCTYPE html>
 <html>

diff --git a/src/MezzioInstaller/Resources/templates/plates/layout.phtml b/src/MezzioInstaller/Resources/templates/plates/layout.phtml
@@ -74,7 +74,7 @@
         </div>
     </footer>
 
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
     <?=$this->section('javascript')?>
 </body>

diff --git a/src/MezzioInstaller/Resources/templates/twig/layout.html.twig b/src/MezzioInstaller/Resources/templates/twig/layout.html.twig
@@ -72,7 +72,7 @@
         </div>
     </footer>
 
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.5.0.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
     {% block javascript %}{% endblock %}
 </body>