Merge remote-tracking branch 'origin/2.x' into 3.x

dbu · dbu · commit c247c8154b5d · 2024-05-04T10:57:08.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,11 @@ Changelog
 2.x
 ===
 
+2.17.1
+------
+
+* Fix readthedocs build.
+
 2.17.0
 ------
 

-Original file line number
+Diff line change
 .x
 ===
 +2.17.1
 +------
++
 +* Fix readthedocs build.
++
 .17.0
 ------