Skip to content

Commit 96e93e8

Browse files
committed
Update CHANGELOG
1 parent 92e9dea commit 96e93e8

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

‎CHANGELOG.rst‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Changelog
44
unreleased
55
**********
66

7+
Bug fixes:
8+
9+
- Fix intersect ``OneOf`` and ``Equal`` choices in ``field2choices`` (:issue:`198`).
10+
Thanks :user:`alexchen-sys` for the PR.
11+
712
Other changes:
813

914
- Drop support for marshmallow 3, which is EOL.
@@ -118,7 +123,7 @@ Other changes:
118123

119124
Bug fixes:
120125

121-
- ``MarshmallowPlugin``: Fix handling of ``Nested`` fields with
126+
- ``MarshmallowPlugin``: Fix handling of ``Nested`` fields with
122127
``allow_none=True`` (:issue:`833`). Thanks :user:`jc-harrison`
123128
for reporting and :user:`kolditz-senec` for the PR.
124129

0 commit comments

Comments
 (0)