Merge branch 'support/4.0.1.x' into support/4.0.x

# Conflicts: # aldryn_django_cms/__init__.py
divio · Jan 16, 2024 · f4e3201 · f4e3201
2 parents cf89392 + 4a6e872
commit f4e3201
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.1.14.dev2 (2022-07-15)
+---------------------------
+
+* Use 4.0.1.dev2 release of django CMS.
+
+
 4.0.0.17.dev13 (2022-07-15)
 ---------------------------
 

diff --git a/aldryn_django_cms/__init__.py b/aldryn_django_cms/__init__.py
@@ -1 +1 @@
-__version__ = '4.0.0.17.dev13'
+__version__ = '4.0.1.14.dev2'
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     packages=find_packages(),
     install_requires=(
         'aldryn-addons',
-        'django-cms==4.0.0dev13',
+        'django-cms==4.0.1.dev2',
         'requests',
 
         # NOTE: django-cms doesn't require this, but many of the addons do.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '4.0.0.17.dev13'
		__version__ = '4.0.1.14.dev2'