Merge branch '6.0' into upgrade-to-61

stevepiercy · web-flow · commit 2747f09ae71b · 2024-04-28T13:49:44.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -341,7 +341,7 @@ def source_replace(app, docname, source):
 # Dict of replacements.
 source_replacements = {
     "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
-    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.10.1",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.11",
     "{NVM_VERSION}": "0.39.5",
     "{SUPPORTED_PYTHON_VERSIONS}": "3.8, 3.9, 3.10, 3.11, or 3.12",
 }
diff --git a/submodules/plone.api b/submodules/plone.api
@@ -1 +1 @@
-Subproject commit 08884b755450cdc5290d640b826d3f659025179f
+Subproject commit 53adcfbe40060377a2d545dec07d0ae49b2db0bf
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
@@ -1 +1 @@
-Subproject commit 848dff077a29cc5ceb52fc2373b3bf74d51cef49
+Subproject commit c03a8c14d903555d2e80e070c57e0b66e417d40b
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit 1ce0d1ecbf4ba7711cfd4577884ff05c201d08c8
+Subproject commit e7d6f1c0be483c6560a552bae615b3f80ec21c1e

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ def source_replace(app, docname, source):`
`341`	`341`	`# Dict of replacements.`
`342`	`342`	`source_replacements = {`
`343`	`343`	`"{PLONE_BACKEND_MINOR_VERSION}": "6.0",`
`344`		`- "{PLONE_BACKEND_PATCH_VERSION}": "6.0.10.1",`
	`344`	`+ "{PLONE_BACKEND_PATCH_VERSION}": "6.0.11",`
`345`	`345`	`"{NVM_VERSION}": "0.39.5",`
`346`	`346`	`"{SUPPORTED_PYTHON_VERSIONS}": "3.8, 3.9, 3.10, 3.11, or 3.12",`
`347`	`347`	`}`