Merge branch '6-dev' into gha-vale

stevepiercy · web-flow · commit a32a9a606bef · 2022-12-21T23:26:36.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -123,6 +123,7 @@
     "plone.restapi/news",
     "plone.restapi/performance",
     "plone.restapi/src",
+    "volto/developer-guidelines/branch-policy.md",
 ]
 
 html_js_files = [

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@`
`123`	`123`	`"plone.restapi/news",`
`124`	`124`	`"plone.restapi/performance",`
`125`	`125`	`"plone.restapi/src",`
	`126`	`+ "volto/developer-guidelines/branch-policy.md",`
`126`	`127`	`]`
`127`	`128`
`128`	`129`	`html_js_files = [`