Merge branch 'django-cms:release/3.10.x' into release/3.10.x

CHANGELOG.rst

@@ -2,11 +2,15 @@
 Changelog
 =========
 
-3.10.1rc1 (2022-06-02)
+3.10.1 (2022-06-02)
 ======================
 
 Bug Fixes:
 ----------
+* Changelog titles for 3.10.x (#7347) (31f399535) -- Mark Walker
+* Request missing from test rendering (#7346) (eff54b0fd) -- Mark Walker
+* Changelog title for 3.10.1rc1 (#7345) (966a90fd2) -- Mark Walker
+* Revert change to the toolbar sites menu to use ``http`` protocol (#7332) (caddfe7f4) -- Mark Walker
 * Fixed ``AttributeError`` (#7288) when the current toolbar object doesn't define ``get_draft_url()`` (#7289) -- Marco Bonetti
 * Fix for django 2.2 in middleware [#7290] (#7293) -- Mark Walker
 * Update release script to start bringing support for macOS (#7294) -- Mark Walker
@@ -16,12 +20,12 @@ Bug Fixes:
 Statistics:
 -----------
 
-This release includes 8 pull requests, and was created with the help of the following contributors (in alphabetical order):
+This release includes 12 pull requests, and was created with the help of the following contributors (in alphabetical order):
 
 * Conrad (3 pull requests)
 * Florian Delizy (1 pull request)
 * Marco Bonetti (1 pull request)
-* Mark Walker (4 pull requests)
+* Mark Walker (7 pull requests)
 
 Thanks to all contributors for their efforts!
 

cms/__init__.py

@@ -1,6 +1,6 @@
 import django
 
-__version__ = '3.10.1rc1'
+__version__ = '3.10.1'
 
 if django.VERSION < (3, 2):
     default_app_config = 'cms.apps.CMSConfig'

cms/static/cms/sass/components/_iconography.scss

@@ -4,12 +4,12 @@
 // default font file generated by gulp
 @font-face {
     font-family: "django-cms-iconfont";
-    src: url("../../fonts/3.10.1rc1/django-cms-iconfont.eot");
-    src: url("../../fonts/3.10.1rc1/django-cms-iconfont.eot#iefix") format("eot"),
-         url("../../fonts/3.10.1rc1/django-cms-iconfont.woff2") format("woff2"),
-         url("../../fonts/3.10.1rc1/django-cms-iconfont.woff") format("woff"),
-         url("../../fonts/3.10.1rc1/django-cms-iconfont.ttf") format("truetype"),
-         url("../../fonts/3.10.1rc1/django-cms-iconfont.svg#django-cms-iconfont") format("svg");
+    src: url("../../fonts/3.10.1/django-cms-iconfont.eot");
+    src: url("../../fonts/3.10.1/django-cms-iconfont.eot#iefix") format("eot"),
+         url("../../fonts/3.10.1/django-cms-iconfont.woff2") format("woff2"),
+         url("../../fonts/3.10.1/django-cms-iconfont.woff") format("woff"),
+         url("../../fonts/3.10.1/django-cms-iconfont.ttf") format("truetype"),
+         url("../../fonts/3.10.1/django-cms-iconfont.svg#django-cms-iconfont") format("svg");
     font-weight: normal;
     font-style: normal;
 }