Skip to content

Commit

Permalink
Merge pull request #1914 from kianmeng/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
lafrech authored Nov 21, 2021
2 parents 0bdd9aa + 2ff4bfc commit 93919a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Bug fixes:
- Don't expose ``Field``\s as ``Schema`` attributes. This reverts a change
introduced in 3.12.0 that causes issues when field names conflict with
``Schema`` attributes or methods. ``Fields``\s are still accessible on a
``Schema`` instance throught the ``fields`` attribute. (:pr:`1843`)
``Schema`` instance through the ``fields`` attribute. (:pr:`1843`)

3.12.1 (2021-05-10)
*******************
Expand Down Expand Up @@ -1336,7 +1336,7 @@ Features:

Bug fixes:

- Allow ``strict`` class Meta option to be overriden by constructor (:issue:`550`). Thanks :user:`douglas-treadwell` for reporting and thanks :user:`podhmo` for the PR.
- Allow ``strict`` class Meta option to be overridden by constructor (:issue:`550`). Thanks :user:`douglas-treadwell` for reporting and thanks :user:`podhmo` for the PR.

2.11.0 (2017-01-08)
+++++++++++++++++++
Expand Down Expand Up @@ -2107,7 +2107,7 @@ Major reworking and simplification of the public API, centered around support fo
* Add ``fields.Method``.
* Add ``fields.Function``.
* Allow binding of extra data to a serialized object by passing the ``extra`` param when initializing a ``Serializer``.
* Add ``relative`` paramater to ``fields.Url`` that allows for relative URLs.
* Add ``relative`` parameter to ``fields.Url`` that allows for relative URLs.

0.1.0 (2013-11-10)
++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion docs/code_of_conduct.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Examples of unacceptable behavior by participants include:
- Publishing private screenshots or quotes of interactions in the
context of this project without all quoted users' *explicit* consent.
- Publishing of private communication that doesn't have to do with
reporting harrassment.
reporting harassment.
- Any of the above even when `presented as "ironic" or
"joking" <https://en.wikipedia.org/wiki/Hipster_racism>`__.
- Any attempt to present "reverse-ism" versions of the above as
Expand Down

0 comments on commit 93919a6

Please sign in to comment.