Merge branch '6-dev' into writing-docs-tips

stevepiercy · web-flow · commit 5099f3470e56 · 2023-02-05T19:56:08.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -320,7 +320,7 @@ def source_replace(app, docname, source):
 # Dict of replacements.
 source_replacements = {
     "{PLONE_BACKEND_MINOR_VERSION}": "6.0",
-    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.2",
+    "{PLONE_BACKEND_PATCH_VERSION}": "6.0.1",
     "{NVM_VERSION}": "0.39.3",
 }
 
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
@@ -1 +1 @@
-Subproject commit 44b7885a881aaac022933cf9fedcb60e9029facd
+Subproject commit 815dbb6ecc0ed87af0dac1c8aa1d7679e2bdfd30
diff --git a/submodules/volto b/submodules/volto
@@ -1 +1 @@
-Subproject commit 4fe89caf2041166f5e1cfc0e90cefe06b37c6eaf
+Subproject commit 0f84668688ce1d69030d2769d32a01d7dde28964

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ def source_replace(app, docname, source):`
`320`	`320`	`# Dict of replacements.`
`321`	`321`	`source_replacements = {`
`322`	`322`	`"{PLONE_BACKEND_MINOR_VERSION}": "6.0",`
`323`		`- "{PLONE_BACKEND_PATCH_VERSION}": "6.0.0.2",`
	`323`	`+ "{PLONE_BACKEND_PATCH_VERSION}": "6.0.1",`
`324`	`324`	`"{NVM_VERSION}": "0.39.3",`
`325`	`325`	`}`
`326`	`326`