Merge branch 'master' into pa-discussion-coreaddon

plone · May 23, 2023 · cb1f72e · cb1f72e
2 parents 74960f3 + 8e0bada
commit cb1f72e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,19 @@ Changelog
 
 .. towncrier release notes start
 
+3.1.1 (2023-05-22)
+------------------
+
+Bug fixes:
+
+
+- Fix transitive circular dependency on `plone.app.layout`.
+  Use moved imports in `plone.base`.
+  Move `plone.app.layout.nextprevious.interfaces.INextPreviousProvider` to `.behaviors.nextprevious`.
+  Move defaultpage warning viewlet to `plone.app.layout`.
+  [@jensens] (fix-circular-dep-palayout)
+
+
 3.1.0 (2023-05-08)
 ------------------
 

diff --git a/news/fix-circular-dep-palayout.bugfix b/news/fix-circular-dep-palayout.bugfix
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 
-version = "3.1.1.dev0"
+version = "3.1.2.dev0"
 
 short_description = (
     "Dexterity is a content type framework for CMF  applications, "