Merge branch '6.0' into install-notes-classic-ui

plone · Oct 25, 2024 · 6c4e276 · 6c4e276
2 parents 2482786 + 8176339
commit 6c4e276
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/submodules/plone.api b/submodules/plone.api
diff --git a/submodules/plone.restapi b/submodules/plone.restapi
diff --git a/submodules/volto b/submodules/volto
+9 −0		CHANGES.rst
+0 −1		news/541.documentation
+1 −1		setup.py
+37 −0		CHANGES.rst
+0 −2		news/1808.bugfix
+0 −1		news/1812.feature
+0 −1		news/1815.documentation
+0 −2		news/1816.bugfix
+0 −1		news/1818.bugfix
+0 −1		news/1822.documentation
+1 −1		setup.py
+1 −0		src/plone/restapi/configure.zcml
+7 −7		src/plone/restapi/services/aliases/configure.zcml
+14 −0		src/plone/restapi/services/site/get.py
+3 −0		src/plone/restapi/tests/http-examples/site_get.resp