Merge branch '6.0' into makefile-combine-plone.api

stevepiercy · web-flow · commit 1d64a04729bc · 2025-03-14T04:14:45.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -321,6 +321,7 @@
     "fawrench": '<span class="fa fa-wrench" style="font-size: 1.6em;"></span>',
     "SUPPORTED_PYTHON_VERSIONS_PLONE60": "3.9, 3.10, 3.11, 3.12, or 3.13",
     "SUPPORTED_PYTHON_VERSIONS_PLONE61": "3.10, 3.11, 3.12, or 3.13",
+    "SUPPORTED_PYTHON_VERSIONS_PLONE62": "3.10, 3.11, 3.12, or 3.13",
 }
 
 
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit fb65888c70f708491102aecad43c35ea4614e2e0
+Subproject commit 570407f05df97e50108fa22b158600575eeb037a

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@`
`321`	`321`	`"fawrench": '<span class="fa fa-wrench" style="font-size: 1.6em;"></span>',`
`322`	`322`	`"SUPPORTED_PYTHON_VERSIONS_PLONE60": "3.9, 3.10, 3.11, 3.12, or 3.13",`
`323`	`323`	`"SUPPORTED_PYTHON_VERSIONS_PLONE61": "3.10, 3.11, 3.12, or 3.13",`
	`324`	`+ "SUPPORTED_PYTHON_VERSIONS_PLONE62": "3.10, 3.11, 3.12, or 3.13",`
`324`	`325`	`}`
`325`	`326`
`326`	`327`